[Win] DumpRenderTree.exe and WebKitTestRunner.exe shouldn't link with WebCoreTestSupport
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2019 02:04:31 +0000 (02:04 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2019 02:04:31 +0000 (02:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=203879

Reviewed by Ross Kirsling.

After r252086, WinCairo DumpRenderTree.exe and
WebKitTestRunner.exe can't start because they are linked with
WinCairoRequirements DLLs unexpectedly.

DumpRenderTree.exe and WebKitTestRunner.exe are just wrapper
programs. They shouldn't link with WinCairoRequirements libs.

* DumpRenderTree/PlatformWin.cmake: Set DumpRenderTree_LIBRARIES only shlwapi.
* WebKitTestRunner/PlatformWin.cmake: Set WebKitTestRunner_LIBRARIES only shlwapi.

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

Tools/ChangeLog
Tools/DumpRenderTree/PlatformWin.cmake
Tools/WebKitTestRunner/PlatformWin.cmake

index 0b7d72f..1bb7e44 100644 (file)
@@ -1,3 +1,20 @@
+2019-11-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] DumpRenderTree.exe and WebKitTestRunner.exe shouldn't link with WebCoreTestSupport
+        https://bugs.webkit.org/show_bug.cgi?id=203879
+
+        Reviewed by Ross Kirsling.
+
+        After r252086, WinCairo DumpRenderTree.exe and
+        WebKitTestRunner.exe can't start because they are linked with
+        WinCairoRequirements DLLs unexpectedly.
+
+        DumpRenderTree.exe and WebKitTestRunner.exe are just wrapper
+        programs. They shouldn't link with WinCairoRequirements libs.
+
+        * DumpRenderTree/PlatformWin.cmake: Set DumpRenderTree_LIBRARIES only shlwapi.
+        * WebKitTestRunner/PlatformWin.cmake: Set WebKitTestRunner_LIBRARIES only shlwapi.
+
 2019-11-06  Kate Cheney  <katherine_cheney@apple.com>
 
         Update entry in contributors.json to fix commit privileges.
index ee66e7f..0c7730b 100644 (file)
@@ -68,18 +68,18 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     TestNetscapePlugIn/Tests/win
 )
 
-list(APPEND DumpRenderTree_LIBRARIES
-    WebKitLegacy
-    shlwapi
-)
-
 set(DumpRenderTreeLib_LIBRARIES
     ${DumpRenderTree_LIBRARIES}
     Comsuppw
     Oleacc
+    WebKitLegacy
     WebKitLegacyGUID
 )
 
+set(DumpRenderTree_LIBRARIES
+    shlwapi
+)
+
 if (${WTF_PLATFORM_WIN_CAIRO})
     list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
         cairo
index fe82701..14a8721 100644 (file)
@@ -35,8 +35,8 @@ set(WebKitTestRunnerLib_LIBRARIES
     Oleacc
 )
 
-list(APPEND WebKitTestRunner_LIBRARIES
-    WebKit
+set(WebKitTestRunner_LIBRARIES
+    shlwapi
 )
 
 set(WebKitTestRunnerInjectedBundle_LIBRARIES