Layout tests do not run when using WebKitTestRunner in a Debug build.
authorjhoneycutt@apple.com <jhoneycutt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Aug 2010 21:29:42 +0000 (21:29 +0000)
committerjhoneycutt@apple.com <jhoneycutt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Aug 2010 21:29:42 +0000 (21:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=44409

Reviewed by Dan Bernstein.

WebKit2:

* UIProcess/Launcher/win/ProcessLauncherWin.cpp:
(WebKit::ProcessLauncher::launchProcess):
Use WebKit2WebProcess_debug.exe when building Debug.

WebKitTools:

* WebKitTestRunner/win/TestControllerWin.cpp:
(WTR::TestController::initializeInjectedBundlePath):
Use InjectedBundle_debug.dll when building Debug.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@65831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit2/ChangeLog
WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
WebKitTools/ChangeLog
WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp

index a2830c0..cdec9ad 100644 (file)
@@ -1,3 +1,14 @@
+2010-08-23  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Layout tests do not run when using WebKitTestRunner in a Debug build.
+        https://bugs.webkit.org/show_bug.cgi?id=44409
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        Use WebKit2WebProcess_debug.exe when building Debug.
+
 2010-08-23  Daniel Bates  <dbates@rim.com>
 
         Rubber-stamped by Adam Roben.
index d7f2044..db9cad4 100644 (file)
 
 using namespace WebCore;
 
+#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
+const LPCWSTR webProcessName = L"WebKit2WebProcess_debug.exe";
+#else
+const LPCWSTR webProcessName = L"WebKit2WebProcess.exe";
+#endif
+
 namespace WebKit {
 
 void ProcessLauncher::launchProcess()
@@ -51,12 +57,8 @@ void ProcessLauncher::launchProcess()
     Vector<UChar> commandLineVector;
 
     // FIXME: We would like to pass a full path to the .exe here.
-#ifndef DEBUG_ALL
-    String commandLine(L"WebKit2WebProcess.exe");
-#else
-    String commandLine(L"WebKit2WebProcess_debug.exe");
-#endif
 
+    String commandLine(webProcessName);
     append(commandLineVector, commandLine);
     append(commandLineVector, " -mode webprocess");
     append(commandLineVector, " -clientIdentifier ");
index ce5e40d..c5ba2bb 100644 (file)
@@ -1,3 +1,14 @@
+2010-08-23  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Layout tests do not run when using WebKitTestRunner in a Debug build.
+        https://bugs.webkit.org/show_bug.cgi?id=44409
+
+        Reviewed by Dan Bernstein.
+
+        * WebKitTestRunner/win/TestControllerWin.cpp:
+        (WTR::TestController::initializeInjectedBundlePath):
+        Use InjectedBundle_debug.dll when building Debug.
+
 2010-08-23  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Martin Robinson.
index e35ee22..9643c40 100644 (file)
@@ -40,8 +40,10 @@ namespace WTR {
 
 #if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
 const LPWSTR testPluginDirectoryName = L"TestNetscapePlugin_Debug";
+const char* injectedBundleDLL = "\\InjectedBundle_debug.dll";
 #else
 const LPWSTR testPluginDirectoryName = L"TestNetscapePlugin";
+const char* injectedBundleDLL = "\\InjectedBundle.dll";
 #endif
 
 static void addQTDirToPATH()
@@ -104,12 +106,7 @@ void TestController::initializeInjectedBundlePath()
 {
     CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle);
     CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath);
-#ifdef DEBUG_ALL
-    CFStringAppendCString(bundlePath, "\\InjectedBundle_debug.dll", kCFStringEncodingWindowsLatin1);
-#else
-    CFStringAppendCString(bundlePath, "\\InjectedBundle.dll", kCFStringEncodingWindowsLatin1);
-#endif
-    
+    CFStringAppendCString(bundlePath, injectedBundleDLL, kCFStringEncodingWindowsLatin1);
     m_injectedBundlePath.adopt(WKStringCreateWithCFString(bundlePath));
 }