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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 6e7a4aa9d6d8599378d1b1e695addbc90d6258af
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 21:20:16 2010 +0000

    Make run-webkit-tests --webkit-test-runner build DumpRenderTree
    in addition to WebKitTestRunner to get the DumpRenderTreeSupport
    module and the TestNetscapePlugin.
    
    Reviewed by Mark Rowe.
    
    * Scripts/old-run-webkit-tests:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 324c32d..34fd84b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-18  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Make run-webkit-tests --webkit-test-runner build DumpRenderTree
+        in addition to WebKitTestRunner to get the DumpRenderTreeSupport
+        module and the TestNetscapePlugin.
+
+        * Scripts/old-run-webkit-tests:
+
 2010-08-18  Adam Roben  <aroben at apple.com>
 
         Fix hang when saving crash logs on Windows
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 68aa6ed..ff6697e 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -94,6 +94,7 @@ sub launchWithEnv(\@\%);
 sub resolveAndMakeTestResultsDirectory();
 sub numericcmp($$);
 sub openDiffTool();
+sub buildDumpTool($);
 sub openDumpTool();
 sub parseLeaksandPrintUniqueLeaks();
 sub openWebSocketServerIfNeeded();
@@ -399,40 +400,18 @@ $productDir .= "/Programs" if isGtk();
 
 chdirWebKit();
 
-my $dumpToolName = $useWebKitTestRunner ? "WebKitTestRunner" : "DumpRenderTree";
-
 if (!defined($root)) {
-    my $dumpToolBuildScript =  "build-" . lc($dumpToolName);
-    print STDERR "Running $dumpToolBuildScript\n";
-
-    local *DEVNULL;
-    my ($childIn, $childOut, $childErr);
-    if ($quiet) {
-        open(DEVNULL, ">", File::Spec->devnull()) or die "Failed to open /dev/null";
-        $childOut = ">&DEVNULL";
-        $childErr = ">&DEVNULL";
-    } else {
-        # When not quiet, let the child use our stdout/stderr.
-        $childOut = ">&STDOUT";
-        $childErr = ">&STDERR";
-    }
-
-    my @args = argumentsForConfiguration();
-    my $buildProcess = open3($childIn, $childOut, $childErr, "WebKitTools/Scripts/$dumpToolBuildScript", @args) or die "Failed to run build-dumprendertree";
-    close($childIn);
-    waitpid $buildProcess, 0;
-    my $buildResult = $?;
-    close($childOut);
-    close($childErr);
-
-    close DEVNULL if ($quiet);
-
-    if ($buildResult) {
-        print STDERR "Compiling $dumpToolName failed!\n";
-        exit exitStatus($buildResult);
-    }
+    # FIXME: We build both DumpRenderTree and WebKitTestRunner for
+    # WebKitTestRunner runs becuase DumpRenderTree still includes
+    # the DumpRenderTreeSupport module and the TestNetscapePlugin.
+    # These two projects should be factored out into their own
+    # projects.
+    buildDumpTool("DumpRenderTree");
+    buildDumpTool("WebKitTestRunner") if $useWebKitTestRunner;
 }
 
+my $dumpToolName = $useWebKitTestRunner ? "WebKitTestRunner" : "DumpRenderTree";
+
 $dumpToolName .= "_debug" if isCygwin() && configurationForVisualStudio() !~ /^Release|Debug_Internal$/;
 my $dumpTool = "$productDir/$dumpToolName";
 die "can't find executable $dumpToolName (looked in $productDir)\n" unless -x $dumpTool;
@@ -1365,6 +1344,41 @@ sub openDiffTool()
     $isDiffToolOpen = 1;
 }
 
+sub buildDumpTool($)
+{
+    my ($dumpToolName) = @_;
+
+    my $dumpToolBuildScript =  "build-" . lc($dumpToolName);
+    print STDERR "Running $dumpToolBuildScript\n";
+
+    local *DEVNULL;
+    my ($childIn, $childOut, $childErr);
+    if ($quiet) {
+        open(DEVNULL, ">", File::Spec->devnull()) or die "Failed to open /dev/null";
+        $childOut = ">&DEVNULL";
+        $childErr = ">&DEVNULL";
+    } else {
+        # When not quiet, let the child use our stdout/stderr.
+        $childOut = ">&STDOUT";
+        $childErr = ">&STDERR";
+    }
+
+    my @args = argumentsForConfiguration();
+    my $buildProcess = open3($childIn, $childOut, $childErr, "WebKitTools/Scripts/$dumpToolBuildScript", @args) or die "Failed to run build-dumprendertree";
+    close($childIn);
+    waitpid $buildProcess, 0;
+    my $buildResult = $?;
+    close($childOut);
+    close($childErr);
+
+    close DEVNULL if ($quiet);
+
+    if ($buildResult) {
+        print STDERR "Compiling $dumpToolName failed!\n";
+        exit exitStatus($buildResult);
+    }
+}
+
 sub openDumpTool()
 {
     return if $isDumpToolOpen;

-- 
WebKit Debian packaging