[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 a6a81b0629ad3cea542e091fe81ffadc55adf7ab
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 18:35:29 2009 +0000

    Fix tests that use the TestNetscapePlugin in Debug_Internal builds
    
    Reviewed by Ada Chan.
    
    Fixes <http://webkit.org/b/32027> REGRESSION (r49705): Tests that use
    TestNetscapePlugin fail in Debug_Internal builds
    
    * DumpRenderTree/win/DumpRenderTree.cpp: Use the "_Debug" plugin
    directory in Debug and Debug_All builds, but not in Debug_Internal
    builds.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4996fd5..a0f705d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,18 @@
 2009-12-01  Adam Roben  <aroben at apple.com>
 
+        Fix tests that use the TestNetscapePlugin in Debug_Internal builds
+
+        Reviewed by Ada Chan.
+
+        Fixes <http://webkit.org/b/32027> REGRESSION (r49705): Tests that use
+        TestNetscapePlugin fail in Debug_Internal builds
+
+        * DumpRenderTree/win/DumpRenderTree.cpp: Use the "_Debug" plugin
+        directory in Debug and Debug_All builds, but not in Debug_Internal
+        builds.
+
+2009-12-01  Adam Roben  <aroben at apple.com>
+
         Re-enable DRT's watchdog timer on Windows
 
         It was accidentally disabled in r50907.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 217cb89..4a88518 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -66,7 +66,7 @@
 
 using namespace std;
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
 const LPWSTR TestPluginDir = L"TestNetscapePlugin_Debug";
 #else
 const LPWSTR TestPluginDir = L"TestNetscapePlugin";

-- 
WebKit Debian packaging