[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 7f559539ef3b81ddcb8d215b3a69c35d55cc92fb
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 4 16:58:55 2009 +0000

    Make run-webkit-tests work for the Debug_Internal Windows configuration
    
    In Debug_Internal, DumpRenderTree.exe and ImageDiff.exe have no _debug
    suffix.
    
    Fixes <http://webkit.org/b/31123>.
    
    Reviewed by Sam Weinig.
    
    * Scripts/run-webkit-tests: Don't add the _debug suffix in
    Debug_Internal, either.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6fdcd92..b2891b6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-04  Adam Roben  <aroben at apple.com>
+
+        Make run-webkit-tests work for the Debug_Internal Windows
+        configuration
+
+        In Debug_Internal, DumpRenderTree.exe and ImageDiff.exe have no _debug
+        suffix.
+
+        Fixes <http://webkit.org/b/31123>.
+
+        Reviewed by Sam Weinig.
+
+        * Scripts/run-webkit-tests: Don't add the _debug suffix in
+        Debug_Internal, either.
+
 2009-11-04  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index e14fec5..85601a3 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -351,12 +351,12 @@ if (!defined($root)) {
 }
 
 my $dumpToolName = "DumpRenderTree";
-$dumpToolName .= "_debug" if isCygwin() && $configuration ne "Release";
+$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;
 
 my $imageDiffTool = "$productDir/ImageDiff";
-$imageDiffTool .= "_debug" if isCygwin() && $configuration ne "Release";
+$imageDiffTool .= "_debug" if isCygwin() && configurationForVisualStudio() !~ /^Release|Debug_Internal$/;
 die "can't find executable $imageDiffTool (looked in $productDir)\n" if $pixelTests && !-x $imageDiffTool;
 
 checkFrameworks() unless isCygwin();

-- 
WebKit Debian packaging