[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 10f5c01da6a3539e8f99480aa5033489bc0fe66d
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 01:57:40 2010 +0000

    run-webkit-tests should not strip editing callbacks when using
    WebKitTestRunner on Windows
    https://bugs.webkit.org/show_bug.cgi?id=44000
    
    Reviewed by Mark Rowe.
    
    * Scripts/old-run-webkit-tests:
    Leave $stripEditingCallbacks undefined until we look for command-line
    arguments. If using WebKit2, set it to 0 if not explicity set on the
    command line. Later, set it to isCygwin() to match old behavior if it is
    not yet defined.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c8ead7b..2c5c2e4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-15  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        run-webkit-tests should not strip editing callbacks when using
+        WebKitTestRunner on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=44000
+
+        Reviewed by Mark Rowe.
+
+        * Scripts/old-run-webkit-tests:
+        Leave $stripEditingCallbacks undefined until we look for command-line
+        arguments. If using WebKit2, set it to 0 if not explicity set on the
+        command line. Later, set it to isCygwin() to match old behavior if it is
+        not yet defined.
+
 2010-08-15  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix, remove define always set to the correct value by wtf/Platform.h.
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 97ef3dc..56bcfb4 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -149,7 +149,7 @@ my $root;
 my $runSample = 1;
 my $shouldCheckLeaks = 0;
 my $showHelp = 0;
-my $stripEditingCallbacks = isCygwin();
+my $stripEditingCallbacks;
 my $testHTTP = 1;
 my $testWebSocket = 1;
 my $testMedia = 1;
@@ -355,11 +355,13 @@ if ($useWebKitTestRunner) {
         $realPlatform = $platform;
         $platform = "mac-wk2";
     } elsif (isAppleWinWebKit()) {
+        $stripEditingCallbacks = 0 unless defined $stripEditingCallbacks;
         $realPlatform = $platform;
         $platform = "win-wk2";
     }
 }
 
+$stripEditingCallbacks = isCygwin() unless defined $stripEditingCallbacks;
 
 my $ignoreSkipped = $treatSkipped eq "ignore";
 my $skippedOnly = $treatSkipped eq "only";

-- 
WebKit Debian packaging