Changeset 65831 in webkit

Timestamp:

Aug 23, 2010 2:29:42 PM (14 years ago)

Author:

jhoneycutt@apple.com

Message:

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.

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.

Location:

trunk

Files:

• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp

@@ -35 +35 @@
 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 {
 
@@ -52 +58 @@
 
     // 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");

trunk/WebKitTools/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp

@@ -41 +41 @@
 #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
 
@@ -105 +107 @@
     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));
 }