Attachment 368506 Details for Bug 196583 – WIP Patch

[patch] WIP Patch

bug-196583.diff (text/plain), 50.00 KB, created by Don Olmstead on 2019-04-29 15:54:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-04-29 15:54:29 PDT

Size: 50.00 KB

patch

obsolete

>diff --git a/Tools/PlatformGTK.cmake b/Tools/PlatformGTK.cmake
>index e9ade7a699a..680911c1ff7 100644
>--- a/Tools/PlatformGTK.cmake
>+++ b/Tools/PlatformGTK.cmake
>@@ -1,3 +1,5 @@
>+set(ENABLE_JSCTEST ON)
>+
> if (DEVELOPER_MODE)
>     add_subdirectory(WebKitTestRunner)
>     add_subdirectory(ImageDiff)
>diff --git a/Tools/PlatformWPE.cmake b/Tools/PlatformWPE.cmake
>index 0172e5d2bdb..704d2de00f0 100644
>--- a/Tools/PlatformWPE.cmake
>+++ b/Tools/PlatformWPE.cmake
>@@ -1,3 +1,5 @@
>+set(ENABLE_JSCTEST ON)
>+
> if (DEVELOPER_MODE OR ENABLE_MINIBROWSER)
>     add_subdirectory(wpe/backends)
> endif ()
>diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
>index d2380f0fad3..686ed6d3e5c 100644
>--- a/Tools/TestWebKitAPI/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/CMakeLists.txt
>@@ -1,310 +1,365 @@
> set(TESTWEBKITAPI_DIR "${TOOLS_DIR}/TestWebKitAPI")
>-set(test_wtf_LIBRARIES
>-    WTF${DEBUG_SUFFIX}
>-    gtest
>-)
> 
>-set(test_webcore_LIBRARIES
>-    WTF${DEBUG_SUFFIX}
>-    WebCore${DEBUG_SUFFIX}
>-    gtest
>+get_property(gtest_DEFINITIONS GLOBAL PROPERTY gtest_DEFINITIONS)
>+add_definitions(${gtest_DEFINITIONS})
>+
>+macro(WEBKIT_TEST _target)
>+    WEBKIT_EXECUTABLE(${_target})
>+    add_test(${_target} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/${_target})
>+    set_tests_properties(${_target} PROPERTIES TIMEOUT 60)
>+    set_target_properties(${_target} PROPERTIES
>+        RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}
>+    )
>+
>+    if (COMPILER_IS_GCC_OR_CLANG)
>+        WEBKIT_ADD_TARGET_CXX_FLAGS(${_target} -Wno-dangling-else
>+                                               -Wno-sign-compare
>+                                               -Wno-undef
>+                                               -Wno-unused-parameter)
>+    endif ()
>+endmacro()
>+
>+# TestWTF definitions
>+set(TestWTF_SOURCES
>+    Counters.cpp
>+    TestsController.cpp
>+
>+    Tests/WTF/AtomicString.cpp
>+    Tests/WTF/BloomFilter.cpp
>+    Tests/WTF/CString.cpp
>+    Tests/WTF/CheckedArithmeticOperations.cpp
>+    Tests/WTF/ConcurrentPtrHashSet.cpp
>+    Tests/WTF/Condition.cpp
>+    Tests/WTF/CrossThreadTask.cpp
>+    Tests/WTF/DateMath.cpp
>+    Tests/WTF/Deque.cpp
>+    Tests/WTF/EnumTraits.cpp
>+    Tests/WTF/Expected.cpp
>+    Tests/WTF/FileSystem.cpp
>+    Tests/WTF/Function.cpp
>+    Tests/WTF/HashCountedSet.cpp
>+    Tests/WTF/HashMap.cpp
>+    Tests/WTF/HashSet.cpp
>+    Tests/WTF/Hasher.cpp
>+    Tests/WTF/IntegerToStringConversion.cpp
>+    Tests/WTF/IteratorRange.cpp
>+    Tests/WTF/JSONValue.cpp
>+    Tests/WTF/LEBDecoder.cpp
>+    Tests/WTF/LifecycleLogger.cpp
>+    Tests/WTF/LineEnding.cpp
>+    Tests/WTF/ListHashSet.cpp
>+    Tests/WTF/Lock.cpp
>+    Tests/WTF/Logger.cpp
>+    Tests/WTF/MD5.cpp
>+    Tests/WTF/Markable.cpp
>+    Tests/WTF/MathExtras.cpp
>+    Tests/WTF/MediaTime.cpp
>+    Tests/WTF/MetaAllocator.cpp
>+    Tests/WTF/MoveOnlyLifecycleLogger.cpp
>+    Tests/WTF/NakedPtr.cpp
>+    Tests/WTF/NeverDestroyed.cpp
>+    Tests/WTF/OptionSet.cpp
>+    Tests/WTF/Optional.cpp
>+    Tests/WTF/ParkingLot.cpp
>+    Tests/WTF/PriorityQueue.cpp
>+    Tests/WTF/RedBlackTree.cpp
>+    Tests/WTF/Ref.cpp
>+    Tests/WTF/RefCounter.cpp
>+    Tests/WTF/RefLogger.cpp
>+    Tests/WTF/RefPtr.cpp
>+    Tests/WTF/RunLoop.cpp
>+    Tests/WTF/SHA1.cpp
>+    Tests/WTF/SaturatedArithmeticOperations.cpp
>+    Tests/WTF/Scope.cpp
>+    Tests/WTF/ScopedLambda.cpp
>+    Tests/WTF/SetForScope.cpp
>+    Tests/WTF/StringBuilder.cpp
>+    Tests/WTF/StringConcatenate.cpp
>+    Tests/WTF/StringHasher.cpp
>+    Tests/WTF/StringImpl.cpp
>+    Tests/WTF/StringOperators.cpp
>+    Tests/WTF/StringView.cpp
>+    Tests/WTF/SynchronizedFixedQueue.cpp
>+    Tests/WTF/TextBreakIterator.cpp
>+    Tests/WTF/ThreadGroup.cpp
>+    Tests/WTF/ThreadMessages.cpp
>+    Tests/WTF/Threading.cpp
>+    Tests/WTF/Time.cpp
>+    Tests/WTF/URL.cpp
>+    Tests/WTF/URLParser.cpp
>+    Tests/WTF/UniqueArray.cpp
>+    Tests/WTF/UniqueRef.cpp
>+    Tests/WTF/Variant.cpp
>+    Tests/WTF/Vector.cpp
>+    Tests/WTF/WTFString.cpp
>+    Tests/WTF/WeakPtr.cpp
>+    Tests/WTF/WorkQueue.cpp
>+    Tests/WTF/WorkerPool.cpp
> )
> 
>-set(TestWebKitAPI_LIBRARIES
>-    WTF${DEBUG_SUFFIX}
>+set(TestWTF_PRIVATE_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>+    ${TESTWEBKITAPI_DIR}
>+    ${THIRDPARTY_DIR}/gtest/include
>+    ${WTF_FRAMEWORK_HEADERS_DIR}
> )
> 
>-set(TestWebKitAPI_DEPENDENCIES
>-    JavaScriptCoreFrameworkHeaders
>-    JavaScriptCorePrivateFrameworkHeaders
>-    WTFFrameworkHeaders
>+set(TestWTF_LIBRARIES
>+    WTF
>+    gtest
> )
> 
>-if (ENABLE_WEBCORE)
>-    list(APPEND TestWebKitAPI_DEPENDENCIES
>-        PALFrameworkHeaders
>-        WebCorePrivateFrameworkHeaders
>-    )
>-endif ()
>+set(TestWTF_DEPENDENCIES WTFFrameworkHeaders)
> 
>-if (ENABLE_WEBKIT)
>-    set(test_webkit_api_LIBRARIES
>-        JavaScriptCore
>-        TestWebKitAPIBase
>-        WTF
>-        WebKit
>-        gtest
>+WEBKIT_EXECUTABLE_DECLARE(TestWTF)
>+
>+# TestJSC definitions
>+if (ENABLE_TESTJSC)
>+    set(TestJSC_Sources
>+        Tests/JavaScriptCore/glib/TestJSC.cpp
>     )
> 
>-    set(test_webkit_api_SOURCES
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/AboutBlankLoad.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/CookieManager.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DownloadDecideDestinationCrash.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/EnumerateMediaDevices.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/EvaluateJavaScript.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/FailedLoad.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/Find.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/FirstMeaningfulPaintMilestone.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ForceRepaint.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/FrameMIMETypeHTML.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/FrameMIMETypePNG.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/Geolocation.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadPageOnCrash.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/MouseMoveAfterCrash.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/PageLoadBasic.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ParentFrame.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/PendingAPIRequestURL.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/PreventEmptyUserAgent.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ReloadPageAfterCrash.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ResizeWindowAfterCrash.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/RestoreSessionStateContainingFormData.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMedia.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMessage.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillSendSubmitEvent.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPreferences.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKRetainPtr.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKString.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKStringJSString.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKURL.cpp
>+    set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
>+        ${CMAKE_BINARY_DIR}
>+        ${TESTWEBKITAPI_DIR}
>+        ${THIRDPARTY_DIR}/gtest/include
>+        ${WTF_FRAMEWORK_HEADERS_DIR}
>+        ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     )
> 
>-    set(TestWebKitAPIBase_LIBRARIES
>+    set(TestJSC_LIBRARIES
>+        ${GLIB_LIBRARIES}
>+        ${GLIB_GMODULE_LIBRARIES}
>         JavaScriptCore
>-        WTF
>-        WebKit
>-        gtest
>     )
> 
>-    set(TestWebKitAPIBase_SOURCES
>-        ${TESTWEBKITAPI_DIR}/JavaScriptTest.cpp
>-        ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
>-        ${TESTWEBKITAPI_DIR}/TestsController.cpp
>+    set(TestJSC_DEFINITIONS
>+        WEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}"
>     )
> 
>-    list(APPEND TestWebKitAPI_LIBRARIES
>-        WebKit
>-    )
>-else ()
>-    list(APPEND TestWebKitAPI_LIBRARIES
>-        WebKitLegacy${DEBUG_SUFFIX}
>-    )
>+    WEBKIT_EXECUTABLE_DECLARE(TestJSC)
> endif ()
> 
>+# TestWebCore definitions
>+if (ENABLE_WEBCORE)
>+    set(TestWebCore_SOURCES
>+        TestsController.cpp
> 
>-set(TestWTF_SOURCES
>-    ${TESTWEBKITAPI_DIR}/Counters.cpp
>-    ${TESTWEBKITAPI_DIR}/TestsController.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/AtomicString.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/BloomFilter.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/CString.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/CheckedArithmeticOperations.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ConcurrentPtrHashSet.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Condition.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/CrossThreadTask.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/DateMath.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Deque.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/EnumTraits.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Expected.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Function.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashCountedSet.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashMap.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/HashSet.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Hasher.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/IntegerToStringConversion.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/IteratorRange.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/JSONValue.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/LEBDecoder.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/LifecycleLogger.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/LineEnding.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ListHashSet.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Lock.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Logger.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MD5.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Markable.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MathExtras.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MediaTime.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MetaAllocator.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/MoveOnlyLifecycleLogger.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/NakedPtr.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/NeverDestroyed.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Optional.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/OptionSet.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ParkingLot.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/PriorityQueue.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RedBlackTree.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Ref.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RefCounter.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RefLogger.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RefPtr.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/RunLoop.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/SHA1.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/SaturatedArithmeticOperations.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Scope.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ScopedLambda.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/SetForScope.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringBuilder.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringConcatenate.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringHasher.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringImpl.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringOperators.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/StringView.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/SynchronizedFixedQueue.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/TextBreakIterator.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ThreadGroup.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/ThreadMessages.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Threading.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Time.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/URL.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/URLParser.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/UniqueArray.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/UniqueRef.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Variant.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/Vector.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/WTFString.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/WeakPtr.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/WorkQueue.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/WorkerPool.cpp
>-)
>+        Tests/WebCore/AffineTransform.cpp
>+        Tests/WebCore/CSSParser.cpp
>+        Tests/WebCore/CalculationValue.cpp
>+        Tests/WebCore/ComplexTextController.cpp
>+        Tests/WebCore/FileMonitor.cpp
>+        Tests/WebCore/FloatPoint.cpp
>+        Tests/WebCore/FloatRect.cpp
>+        Tests/WebCore/FloatSize.cpp
>+        Tests/WebCore/GridPosition.cpp
>+        Tests/WebCore/HTMLParserIdioms.cpp
>+        Tests/WebCore/IntPoint.cpp
>+        Tests/WebCore/IntRect.cpp
>+        Tests/WebCore/IntSize.cpp
>+        Tests/WebCore/LayoutUnit.cpp
>+        Tests/WebCore/MIMETypeRegistry.cpp
>+        Tests/WebCore/ParsedContentRange.cpp
>+        Tests/WebCore/PublicSuffix.cpp
>+        Tests/WebCore/SecurityOrigin.cpp
>+        Tests/WebCore/SharedBuffer.cpp
>+        Tests/WebCore/SharedBufferTest.cpp
>+        Tests/WebCore/TimeRanges.cpp
>+        Tests/WebCore/TransformationMatrix.cpp
>+        Tests/WebCore/URLParserTextEncoding.cpp
>+    )
> 
>-# FIXME: Make these work on Windows too.
>-if (NOT WIN32)
>-    list(APPEND TestWTF_SOURCES
>-        ${TESTWEBKITAPI_DIR}/Tests/WTF/FileSystem.cpp
>+    set(TestWebCore_LIBRARIES
>+        WebCore
>+        WebCoreTestSupport
>+        gtest
>     )
>+
>+    set(TestWebCore_PRIVATE_INCLUDE_DIRECTORIES
>+        ${CMAKE_BINARY_DIR}
>+        ${TESTWEBKITAPI_DIR}
>+        ${THIRDPARTY_DIR}/gtest/include
>+        ${PAL_FRAMEWORK_HEADERS_DIR}
>+        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+        ${WTF_FRAMEWORK_HEADERS_DIR}
>+    )
>+
>+    set(TestWebCore_DEPENDENCIES WebCorePrivateFrameworkHeaders)
>+
>+    WEBKIT_EXECUTABLE_DECLARE(TestWebCore)
> endif ()
> 
>-# FIXME: Platform-specific sources in Tests/WTF are not included in TestWTF_SOURCES.
>+# TestWebKitLegacy definitions
>+if (ENABLE_WEBKIT_LEGACY)
>+    set(TestWebKitLegacy_SOURCES
>+        TestsController.cpp
>+    )
> 
>-WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
>+    set(TestWebKitLegacy_LIBRARIES
>+        WebKitLegacy
>+        gtest
>+    )
> 
>-include_directories(
>-    ${TESTWEBKITAPI_DIR}
>-    ${CMAKE_BINARY_DIR}
>-    ${CMAKE_SOURCE_DIR}/Source
>-    ${JAVASCRIPTCORE_DIR}
>-    ${THIRDPARTY_DIR}/gtest/include
>-    ${WEBKIT_DIR}/Platform/IPC
>-    ${WEBKIT_DIR}/Shared
>-    ${WEBKIT_DIR}/Shared/API
>-    ${WEBKIT_DIR}/Shared/API/c
>-    ${WEBKIT_DIR}/Shared/Plugins
>-    ${WEBKIT_DIR}/UIProcess
>-    ${WEBKIT_DIR}/UIProcess/API
>-    ${WEBKIT_DIR}/UIProcess/API/C
>-    ${WEBKIT_DIR}/WebProcess/InjectedBundle
>-    ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/c
>-)
>+    set(TestWebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
>+        ${CMAKE_BINARY_DIR}
>+        ${TESTWEBKITAPI_DIR}
>+        ${THIRDPARTY_DIR}/gtest/include
>+        ${PAL_FRAMEWORK_HEADERS_DIR}
>+        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+        ${WTF_FRAMEWORK_HEADERS_DIR}
>+        ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
>+    )
>+
>+    set(TestWebKitLegacy_DEPENDENCIES WebKitLegacyFrameworkHeaders)
> 
>+    WEBKIT_EXECUTABLE_DECLARE(TestWebKitLegacy)
>+endif ()
>+
>+# TestWebKit definitions
> if (ENABLE_WEBKIT)
>-    add_library(TestWebKitAPIInjectedBundle SHARED
>-        ${bundle_harness_SOURCES}
>-        ${TESTWEBKITAPI_DIR}/InjectedBundleController.cpp
>-        ${TESTWEBKITAPI_DIR}/InjectedBundleMain.cpp
>-        ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DidAssociateFormControls_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadCanceledNoServerRedirectCallback_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/MouseMoveAfterCrash_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/FirstMeaningfulPaintMilestone_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ParentFrame_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/TextFieldDidBeginAndEndEditing_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMessage_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillLoad_Bundle.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillSendSubmitEvent_Bundle.cpp
>+    set(TestWebKit_SOURCES
>+        Tests/WebKit/AboutBlankLoad.cpp
>+        Tests/WebKit/CanHandleRequest.cpp
>+        Tests/WebKit/CookieManager.cpp
>+        Tests/WebKit/DOMWindowExtensionBasic.cpp
>+        Tests/WebKit/DOMWindowExtensionNoCache.cpp
>+        Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp
>+        Tests/WebKit/DownloadDecideDestinationCrash.cpp
>+        Tests/WebKit/EnumerateMediaDevices.cpp
>+        Tests/WebKit/EvaluateJavaScript.cpp
>+        Tests/WebKit/FailedLoad.cpp
>+        Tests/WebKit/Find.cpp
>+        Tests/WebKit/FirstMeaningfulPaintMilestone.cpp
>+        Tests/WebKit/ForceRepaint.cpp
>+        Tests/WebKit/FrameMIMETypeHTML.cpp
>+        Tests/WebKit/FrameMIMETypePNG.cpp
>+        Tests/WebKit/Geolocation.cpp
>+        Tests/WebKit/GetInjectedBundleInitializationUserDataCallback.cpp
>+        Tests/WebKit/HitTestResultNodeHandle.cpp
>+        Tests/WebKit/InjectedBundleBasic.cpp
>+        Tests/WebKit/InjectedBundleFrameHitTest.cpp
>+        Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins.cpp
>+        Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
>+        Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
>+        Tests/WebKit/LoadPageOnCrash.cpp
>+        Tests/WebKit/MouseMoveAfterCrash.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp
>+        Tests/WebKit/PageLoadBasic.cpp
>+        Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp
>+        Tests/WebKit/ParentFrame.cpp
>+        Tests/WebKit/PendingAPIRequestURL.cpp
>+        Tests/WebKit/PreventEmptyUserAgent.cpp
>+        Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp
>+        Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp
>+        Tests/WebKit/ReloadPageAfterCrash.cpp
>+        Tests/WebKit/ResizeWindowAfterCrash.cpp
>+        Tests/WebKit/RestoreSessionStateContainingFormData.cpp
>+        Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp
>+        Tests/WebKit/UserMedia.cpp
>+        Tests/WebKit/UserMessage.cpp
>+        Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
>+        Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
>+        Tests/WebKit/WKPreferences.cpp
>+        Tests/WebKit/WKRetainPtr.cpp
>+        Tests/WebKit/WKString.cpp
>+        Tests/WebKit/WKStringJSString.cpp
>+        Tests/WebKit/WKURL.cpp
>+        Tests/WebKit/WillSendSubmitEvent.cpp
>     )
> 
>-    target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
>-    add_dependencies(TestWebKitAPIInjectedBundle WTF ${TestWebKitAPI_DEPENDENCIES})
>+    set(TestWebKit_PRIVATE_INCLUDE_DIRECTORIES
>+        ${CMAKE_BINARY_DIR}
>+        ${TESTWEBKITAPI_DIR}
>+        ${THIRDPARTY_DIR}/gtest/include
>+        ${PAL_FRAMEWORK_HEADERS_DIR}
>+        ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+        ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
>+        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+        ${WTF_FRAMEWORK_HEADERS_DIR}
>+        ${WebKit_FRAMEWORK_HEADERS_DIR}
>+    )
> 
>-    if (COMPILER_IS_GCC_OR_CLANG)
>-        WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKitAPIInjectedBundle -Wno-dangling-else
>-                                                                -Wno-sign-compare
>-                                                                -Wno-undef
>-                                                                -Wno-unused-parameter)
>-    endif ()
>-endif ()
>+    set(TestWebKit_LIBRARIES
>+        TestWebKitAPIBase
>+        WebKit
>+        gtest
>+    )
> 
>-get_property(gtest_DEFINITIONS GLOBAL PROPERTY gtest_DEFINITIONS)
>+    set(TestWebKit_DEPENDENCIES
>+        NetworkProcess
>+        TestWebKitAPIInjectedBundle
>+        WebProcess
>+    )
> 
>-add_definitions(
>-    ${gtest_DEFINITIONS}
>-    -DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit\"
>-)
>+    add_library(TestWebKitAPIBase STATIC
>+        JavaScriptTest.cpp
>+        PlatformUtilities.cpp
>+        TestsController.cpp
>+    )
>+    target_compile_definitions(TestWebKitAPIBase PRIVATE BUILDING_TestWebKit)
>+    target_include_directories(TestWebKitAPIBase PRIVATE ${TestWebKit_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_link_libraries(TestWebKitAPIBase PRIVATE WebKit gtest)
> 
>-add_executable(TestWTF
>-    ${test_main_SOURCES}
>-    ${TestWTF_SOURCES}
>-)
>+    add_library(TestWebKitAPIInjectedBundle SHARED
>+        InjectedBundleController.cpp
>+        InjectedBundleMain.cpp
>+        PlatformUtilities.cpp
>+        Tests/WebKit/CanHandleRequest_Bundle.cpp
>+        Tests/WebKit/DidAssociateFormControls_Bundle.cpp
>+        Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
>+        Tests/WebKit/DOMWindowExtensionNoCache_Bundle.cpp
>+        Tests/WebKit/DocumentStartUserScriptAlertCrash_Bundle.cpp
>+        Tests/WebKit/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
>+        Tests/WebKit/HitTestResultNodeHandle_Bundle.cpp
>+        Tests/WebKit/InjectedBundleBasic_Bundle.cpp
>+        Tests/WebKit/InjectedBundleFrameHitTest_Bundle.cpp
>+        Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
>+        Tests/WebKit/LoadCanceledNoServerRedirectCallback_Bundle.cpp
>+        Tests/WebKit/MouseMoveAfterCrash_Bundle.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
>+        Tests/WebKit/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
>+        Tests/WebKit/FirstMeaningfulPaintMilestone_Bundle.cpp
>+        Tests/WebKit/ParentFrame_Bundle.cpp
>+        Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
>+        Tests/WebKit/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
>+        Tests/WebKit/TextFieldDidBeginAndEndEditing_Bundle.cpp
>+        Tests/WebKit/UserMessage_Bundle.cpp
>+        Tests/WebKit/WillLoad_Bundle.cpp
>+        Tests/WebKit/WillSendSubmitEvent_Bundle.cpp
>+    )
>+    target_compile_definitions(TestWebKitAPIInjectedBundle PRIVATE BUILDING_TestWebKit)
>+    target_include_directories(TestWebKitAPIInjectedBundle PRIVATE ${TestWebKit_PRIVATE_INCLUDE_DIRECTORIES})
>+    target_link_libraries(TestWebKitAPIInjectedBundle PRIVATE WebKit)
> 
>-if (WIN32)
>-    add_dependencies(TestWTF TestWTFLib)
>-else ()
>-    add_dependencies(TestWTF WTF ${TestWebKitAPI_DEPENDENCIES})
>+    WEBKIT_EXECUTABLE_DECLARE(TestWebKit)
> endif ()
> 
>-target_link_libraries(TestWTF ${test_wtf_LIBRARIES})
>-add_test(TestWTF ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF}/TestWTF)
>-set_tests_properties(TestWTF PROPERTIES TIMEOUT 60)
>-set_target_properties(TestWTF PROPERTIES
>-    RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF}
>-)
>+# Include platform specific files
>+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-if (COMPILER_IS_GCC_OR_CLANG)
>-    WEBKIT_ADD_TARGET_CXX_FLAGS(TestWTF -Wno-dangling-else
>-                                        -Wno-sign-compare
>-                                        -Wno-undef
>-                                        -Wno-unused-parameter)
>-endif ()
>+# TestWTF target
>+WEBKIT_TEST(TestWTF)
> 
>-if (ENABLE_WEBKIT)
>-    add_library(TestWebKitAPIBase
>-        ${test_main_SOURCES}
>-        ${webkit_api_harness_SOURCES}
>-        ${TestWebKitAPIBase_SOURCES}
>-    )
>+# TestJSC target
>+WEBKIT_TEST(TestJSC)
> 
>-    target_link_libraries(TestWebKitAPIBase ${TestWebKitAPIBase_LIBRARIES})
>+# TestWebCore target
>+if (ENABLE_WEBCORE)
>+    WEBKIT_TEST(TestWebCore)
>+endif ()
> 
>-    add_dependencies(TestWebKitAPIBase WebKit ${TestWebKitAPI_DEPENDENCIES})
>+# TestWebKitLegacy target
>+if (ENABLE_WEBKIT_LEGACY)
>+    WEBKIT_TEST(TestWebKitLegacy)
>+endif ()
> 
>-    if (COMPILER_IS_GCC_OR_CLANG)
>-        WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKitAPIBase -Wno-sign-compare
>-                                                      -Wno-undef
>-                                                      -Wno-unused-parameter)
>-    endif ()
>+# TestWebKit target
>+if (ENABLE_WEBKIT)
>+    WEBKIT_TEST(TestWebKit)
> endif ()
>diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
>index a4f2abd7999..2c61367d9c2 100644
>--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
>+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
>@@ -1,5 +1,4 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
>-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
> 
> # This is necessary because it is possible to build TestWebKitAPI with WebKit
> # disabled and this triggers the inclusion of the WebKit headers.
>diff --git a/Tools/TestWebKitAPI/PlatformJSCOnly.cmake b/Tools/TestWebKitAPI/PlatformJSCOnly.cmake
>index b55698bbfbf..7b89b473f24 100644
>--- a/Tools/TestWebKitAPI/PlatformJSCOnly.cmake
>+++ b/Tools/TestWebKitAPI/PlatformJSCOnly.cmake
>@@ -1,12 +1,9 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
>-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
> 
>-include_directories(
>-    ${FORWARDING_HEADERS_DIR}
>-)
>+list(APPEND TestWTF_SOURCES generic/main.cpp)
> 
> if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
>-    include_directories(SYSTEM
>+    list(APPEND TestWTF_PRIVATE_INCLUDE_DIRECTORIES
>         ${GLIB_INCLUDE_DIRS}
>     )
>     list(APPEND TestWTF_SOURCES
>@@ -17,7 +14,3 @@ else ()
>         ${TESTWEBKITAPI_DIR}/generic/UtilitiesGeneric.cpp
>     )
> endif ()
>-
>-set(test_main_SOURCES
>-    ${TESTWEBKITAPI_DIR}/generic/main.cpp
>-)
>diff --git a/Tools/TestWebKitAPI/PlatformMac.cmake b/Tools/TestWebKitAPI/PlatformMac.cmake
>index 55602421441..4e295d64c7d 100644
>--- a/Tools/TestWebKitAPI/PlatformMac.cmake
>+++ b/Tools/TestWebKitAPI/PlatformMac.cmake
>@@ -1,5 +1,4 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
>-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
> 
> include_directories(
>     "${FORWARDING_HEADERS_DIR}"
>diff --git a/Tools/TestWebKitAPI/PlatformPlayStation.cmake b/Tools/TestWebKitAPI/PlatformPlayStation.cmake
>index f1fcb041c75..4b8eabd4510 100644
>--- a/Tools/TestWebKitAPI/PlatformPlayStation.cmake
>+++ b/Tools/TestWebKitAPI/PlatformPlayStation.cmake
>@@ -1,17 +1,14 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
>-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
>-
>-add_definitions(-DBUILDING_JSCONLY__)
>-
>-include_directories(
>-    ${ICU_INCLUDE_DIRS}
>-    ${FORWARDING_HEADERS_DIR}
>-)
> 
> set(test_main_SOURCES
>-    ${TESTWEBKITAPI_DIR}/generic/main.cpp
>+    generic/main.cpp
> )
> 
> list(APPEND TestWTF_SOURCES
>-    ${TESTWEBKITAPI_DIR}/generic/UtilitiesGeneric.cpp
>+    ${test_main_SOURCES}
>+    generic/UtilitiesGeneric.cpp
>+)
>+
>+list(APPEND TestWebCore_SOURCES
>+    ${test_main_SOURCES}
> )
>diff --git a/Tools/TestWebKitAPI/PlatformUtilities.h b/Tools/TestWebKitAPI/PlatformUtilities.h
>index 017471992e4..e2fb69024bb 100644
>--- a/Tools/TestWebKitAPI/PlatformUtilities.h
>+++ b/Tools/TestWebKitAPI/PlatformUtilities.h
>@@ -26,10 +26,8 @@
> #ifndef PlatformUtilities_h
> #define PlatformUtilities_h
> 
>-#ifndef BUILDING_JSCONLY__
> #include <WebKit/WKNativeEvent.h>
> #include <WebKit/WKRetainPtr.h>
>-#endif
> 
> #include "Utilities.h"
> #include <string>
>diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake
>index f144308d65f..d433f77f6a3 100644
>--- a/Tools/TestWebKitAPI/PlatformWPE.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake
>@@ -1,5 +1,4 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
>-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF")
> 
> # This is necessary because it is possible to build TestWebKitAPI with WebKit2
> # disabled and this triggers the inclusion of the WebKit2 headers.
>@@ -10,7 +9,7 @@ add_custom_target(TestWebKitAPI-forwarding-headers
>     DEPENDS webkitwpe-forwarding-headers
> )
> 
>-list(APPEND TestWebKitAPI_DEPENDENCIES TestWebKitAPI-forwarding-headers)
>+list(APPEND TestWebKit_DEPENDENCIES TestWebKitAPI-forwarding-headers)
> 
> include_directories(
>     ${FORWARDING_HEADERS_DIR}
>@@ -30,98 +29,58 @@ include_directories(SYSTEM
>     ${WPEBACKEND_FDO_INCLUDE_DIRS}
> )
> 
>-set(test_main_SOURCES
>-    ${TESTWEBKITAPI_DIR}/generic/main.cpp
>-)
>-
>-set(bundle_harness_SOURCES
>-    ${TESTWEBKITAPI_DIR}/glib/UtilitiesGLib.cpp
>-    ${TESTWEBKITAPI_DIR}/wpe/InjectedBundleControllerWPE.cpp
>-    ${TESTWEBKITAPI_DIR}/wpe/PlatformUtilitiesWPE.cpp
>-)
>-
>-set(webkit_api_harness_SOURCES
>-    ${TESTWEBKITAPI_DIR}/glib/UtilitiesGLib.cpp
>-    ${TESTWEBKITAPI_DIR}/wpe/PlatformUtilitiesWPE.cpp
>-    ${TESTWEBKITAPI_DIR}/wpe/PlatformWebViewWPE.cpp
>-)
>+set(test_main_SOURCES generic/main.cpp)
> 
> # TestWTF
>-
> list(APPEND TestWTF_SOURCES
>-    ${TESTWEBKITAPI_DIR}/glib/UtilitiesGLib.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/GUniquePtr.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/WorkQueueGLib.cpp
>+    ${test_main_SOURCES}
>+
>+    Tests/WTF/glib/GUniquePtr.cpp
>+    Tests/WTF/glib/WorkQueueGLib.cpp
>+
>+    glib/UtilitiesGLib.cpp
> )
> 
> # TestWebCore
>-
>-add_executable(TestWebCore
>+list(APPEND TestWebCore_SOURCES
>     ${test_main_SOURCES}
>-    ${TESTWEBKITAPI_DIR}/glib/UtilitiesGLib.cpp
>-    ${TESTWEBKITAPI_DIR}/TestsController.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileMonitor.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/gstreamer/GstMappedBuffer.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/gstreamer/GStreamerTest.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/MIMETypeRegistry.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/PublicSuffix.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBuffer.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBufferTest.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/URLParserTextEncoding.cpp
>-)
> 
>-target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
>-add_dependencies(TestWebCore ${TestWebKitAPI_DEPENDENCIES})
>+    Tests/WebCore/gstreamer/GStreamerTest.cpp
>+    Tests/WebCore/gstreamer/GstMappedBuffer.cpp
> 
>-add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
>-set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
>-set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)
>+    glib/UtilitiesGLib.cpp
>+)
> 
> # TestWebKit
>+list(APPEND TestWebKit_SOURCES
>+    ${test_main_SOURCES}
> 
>-list(APPEND test_webkit_api_LIBRARIES
>-    WPEToolingBackends
>+    ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp
>+    ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp
>+
>+    glib/UtilitiesGLib.cpp
>+
>+    wpe/PlatformUtilitiesWPE.cpp
>+    wpe/PlatformWebViewWPE.cpp
> )
> 
>-add_executable(TestWebKit ${test_webkit_api_SOURCES})
>+list(APPEND TestWebKit_PRIVATE_INCLUDE_DIRECTORIES
>+    "${CMAKE_SOURCE_DIR}/Source"
>+)
> 
>-target_link_libraries(TestWebKit ${test_webkit_api_LIBRARIES})
>-add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit)
>-set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
>-set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
>+list(APPEND TestWebKit_LIBRARIES
>+    ${WPEBACKEND_FDO_LIBRARIES}
>+    WPEToolingBackends
>+)
> 
> # TestWebKitAPIBase
>-list(APPEND TestWebKitAPIBase_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})
>-list(APPEND TestWebKitAPI_LIBRARIES ${WPEBACKEND_FDO_LIBRARIES})
>-list(APPEND TestWebKitAPIBase_SOURCES
>-    ${TOOLS_DIR}/wpe/backends/ViewBackend.cpp
>-    ${TOOLS_DIR}/wpe/backends/HeadlessViewBackend.cpp
>-)
>+target_include_directories(TestWebKitAPIBase PRIVATE "${CMAKE_SOURCE_DIR}/Source")
> 
>-# TestJSC
>+# TestWebKitAPIInjectedBundle
>+target_sources(TestWebKitAPIInjectedBundle PRIVATE
>+    glib/UtilitiesGLib.cpp
> 
>-add_definitions(-DWEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}")
>-add_executable(TestJSC ${TESTWEBKITAPI_DIR}/Tests/JavaScriptCore/glib/TestJSC.cpp)
>-target_link_libraries(TestJSC
>-    ${GLIB_LIBRARIES}
>-    ${GLIB_GMODULE_LIBRARIES}
>-    JavaScriptCore
>+    wpe/InjectedBundleControllerWPE.cpp
>+    wpe/PlatformUtilitiesWPE.cpp
> )
>-add_test(TestJSC ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore/TestJSC)
>-add_dependencies(TestJSC ${TestWebKitAPI_DEPENDENCIES})
>-set_tests_properties(TestJSC PROPERTIES TIMEOUT 60)
>-set_target_properties(TestJSC PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)
>-
>-if (COMPILER_IS_GCC_OR_CLANG)
>-    WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebCore -Wno-sign-compare
>-                                            -Wno-undef
>-                                            -Wno-unused-parameter)
>-    WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKit -Wno-sign-compare
>-                                           -Wno-undef
>-                                           -Wno-unused-parameter)
>-    WEBKIT_ADD_TARGET_CXX_FLAGS(TestJSC -Wno-sign-compare
>-                                        -Wno-undef
>-                                        -Wno-unused-parameter)
>-endif ()
>+target_include_directories(TestWebKitAPIInjectedBundle PRIVATE "${CMAKE_SOURCE_DIR}/Source")
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index 355fe028b82..4dfdbf07193 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -1,34 +1,44 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
>-set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
>-add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
>+
>+set(wrapper_DEFINITIONS USE_CONSOLE_ENTRY_POINT)
> 
> if (${WTF_PLATFORM_WIN_CAIRO})
>-    add_definitions(-DWIN_CAIRO)
>+    list(APPEND wrapper_DEFINITIONS WIN_CAIRO)
> endif ()
> 
>+add_definitions(-DWEBCORE_EXPORT= -DWEBCORE_TESTSUPPORT_EXPORT=)
>+add_definitions(-DSTATICALLY_LINKED_WITH_PAL=1)
>+
> set(test_main_SOURCES
>-    ${TESTWEBKITAPI_DIR}/win/main.cpp
>+    win/main.cpp
> )
> 
>-include_directories(
>-    ${DERIVED_SOURCES_DIR}
>-    ${FORWARDING_HEADERS_DIR}
>-    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
>-    ${TESTWEBKITAPI_DIR}/win
>-    ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
>-    ${WTF_FRAMEWORK_HEADERS_DIR}
>-    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
>-    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>-    ${PAL_FRAMEWORK_HEADERS_DIR}
>-    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>-    ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
>-    ${WebKit_FRAMEWORK_HEADERS_DIR}
>-    ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
>+# TestWTF
>+list(REMOVE_ITEM TestWTF_SOURCES Tests/WTF/FileSystem.cpp)
>+list(APPEND TestWTF_SOURCES
>+    ${test_main_SOURCES}
>+    win/UtilitiesWin.cpp
> )
> 
>-add_definitions(-DWEBCORE_EXPORT= -DWEBCORE_TESTSUPPORT_EXPORT=)
>+WEBKIT_WRAP_EXECUTABLE(TestWTF
>+    SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+    LIBRARIES shlwapi
>+)
>+target_compile_definitions(TestWTF PRIVATE ${wrapper_DEFINITIONS})
>+set(TestWTF_OUTPUT_NAME TestWTF${DEBUG_SUFFIX})
>+
>+# TestWebCore
>+list(APPEND TestWebCore_SOURCES
>+    ${test_main_SOURCES}
>+
>+    Tests/WebCore/win/DIBPixelData.cpp
>+    Tests/WebCore/win/LinkedFonts.cpp
> 
>-set(test_webcore_LIBRARIES
>+    win/TestWebCoreStubs.cpp
>+)
>+set(TestWebCore_EXECUTABLE_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
>+
>+list(APPEND TestWebCore_LIBRARIES
>     Crypt32
>     D2d1
>     Dwrite
>@@ -37,42 +47,11 @@ set(test_webcore_LIBRARIES
>     Psapi
>     Shlwapi
>     Usp10
>-    WebCore${DEBUG_SUFFIX}
>     WindowsCodecs
>-    gtest
>-)
>-
>-set(TestWebCoreLib_SOURCES
>-    ${test_main_SOURCES}
>-    win/TestWebCoreStubs.cpp
>-    ${TESTWEBKITAPI_DIR}/TestsController.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/AffineTransform.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/CalculationValue.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/ComplexTextController.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/CSSParser.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/FloatRect.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/FloatPoint.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/FloatSize.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/GridPosition.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/IntRect.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/IntPoint.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/IntSize.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/MIMETypeRegistry.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/ParsedContentRange.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/SecurityOrigin.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBuffer.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/SharedBufferTest.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/TimeRanges.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/TransformationMatrix.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/URLParserTextEncoding.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/DIBPixelData.cpp
>-    ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/LinkedFonts.cpp
> )
> 
> if (${WTF_PLATFORM_WIN_CAIRO})
>-    list(APPEND test_webcore_LIBRARIES
>+    list(APPEND TestWebCore_LIBRARIES
>         ${CAIRO_LIBRARIES}
>         ${OPENSSL_LIBRARIES}
>         libANGLE
>@@ -80,14 +59,15 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>         strmiids
>         vcruntime
>     )
>-    list(APPEND TestWebCoreLib_SOURCES
>-        ${TESTWEBKITAPI_DIR}/Tests/WebCore/curl/Cookies.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebCore/win/BitmapImage.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebCore/CryptoDigest.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebCore/PublicSuffix.cpp
>+    list(APPEND TestWebCore_SOURCES
>+        Tests/WebCore/CryptoDigest.cpp
>+
>+        Tests/WebCore/curl/Cookies.cpp
>+
>+        Tests/WebCore/win/BitmapImage.cpp
>     )
> else ()
>-    list(APPEND test_webcore_LIBRARIES
>+    list(APPEND TestWebCore_LIBRARIES
>         ASL${DEBUG_SUFFIX}
>         CFNetwork${DEBUG_SUFFIX}
>         CoreGraphics${DEBUG_SUFFIX}
>@@ -102,126 +82,79 @@ else ()
> endif ()
> 
> if (USE_CF)
>-    list(APPEND test_webcore_LIBRARIES
>+    list(APPEND TestWebCore_LIBRARIES
>         ${COREFOUNDATION_LIBRARY}
>     )
> endif ()
> 
>-if (ENABLE_WEBKIT)
>-    list(APPEND TestWebKitAPI_DEPENDENCIES WebKitFrameworkHeaders)
>-endif ()
>-
>-add_library(TestWTFLib SHARED
>-    ${test_main_SOURCES}
>-    ${TestWTF_SOURCES}
>-    ${TESTWEBKITAPI_DIR}/win/UtilitiesWin.cpp
>-)
>-set_target_properties(TestWTFLib PROPERTIES OUTPUT_NAME "TestWTFLib")
>-target_link_libraries(TestWTFLib ${test_wtf_LIBRARIES})
>-add_dependencies(TestWTFLib ${TestWebKitAPI_DEPENDENCIES})
>-
>-set(test_wtf_LIBRARIES
>-    shlwapi
>-)
>-set(TestWTF_SOURCES
>-)
>-
>-add_library(TestWebCoreLib SHARED
>-    ${TestWebCoreLib_SOURCES}
>+WEBKIT_WRAP_EXECUTABLE(TestWebCore
>+    SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+    LIBRARIES shlwapi
> )
>+target_compile_definitions(TestWebCore PRIVATE ${wrapper_DEFINITIONS})
>+set(TestWebcore_OUTPUT_NAME TestWebCore${DEBUG_SUFFIX})
> 
>-target_link_libraries(TestWebCoreLib ${test_webcore_LIBRARIES})
>-set_target_properties(TestWebCoreLib PROPERTIES OUTPUT_NAME "TestWebCoreLib")
>-add_dependencies(TestWebCoreLib ${TestWebKitAPI_DEPENDENCIES})
>-
>-if (PAL_LIBRARY_TYPE MATCHES STATIC)
>-    target_compile_definitions(TestWebCoreLib PRIVATE -DSTATICALLY_LINKED_WITH_PAL=1)
>-endif ()
>-
>-add_executable(TestWebCore
>-    ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>-)
>-target_link_libraries(TestWebCore shlwapi)
>-
>+# TestWebKitLegacy
>+if (ENABLE_WEBKIT_LEGACY)
>+    list(APPEND TestWebKitLegacy_SOURCES
>+        ${test_main_SOURCES}
> 
>-add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebCore)
>-set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
>+        Tests/WebKitLegacy/win/ScaleWebView.cpp
>+        Tests/WebKitLegacy/win/WebViewDestruction.cpp
> 
>-if (${WTF_PLATFORM_WIN_CAIRO})
>-    include_directories(
>-        ${CAIRO_INCLUDE_DIRS}
>+        win/HostWindow.cpp
>     )
>-endif ()
>-
>-set(test_webkitlegacy_LIBRARIES
>-    WebCoreTestSupport
>-    WebKitLegacy${DEBUG_SUFFIX}
>-    gtest
>-)
>+    set(TestWebKitLegacy_EXECUTABLE_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
> 
>-if (ENABLE_WEBKIT_LEGACY)
>-    add_library(TestWebKitLegacyLib SHARED
>-        ${test_main_SOURCES}
>-        ${TESTWEBKITAPI_DIR}/TestsController.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/ScaleWebView.cpp
>-        ${TESTWEBKITAPI_DIR}/Tests/WebKitLegacy/win/WebViewDestruction.cpp
>-        ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
>+    list(APPEND TestWebKitLegacy_LIBRARIES
>+        WTF
>     )
> 
>-    target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
>-    add_dependencies(TestWebKitLegacyLib ${TestWebKitAPI_DEPENDENCIES})
>-
>-    add_executable(TestWebKitLegacy
>-        ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+    list(APPEND TestWebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
>+        ${TESTWEBKITAPI_DIR}/win
>     )
>-    target_link_libraries(TestWebKitLegacy shlwapi)
>-
>-    add_test(TestWebKitLegacy ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitLegacy)
>-    set_tests_properties(TestWebKitLegacy PROPERTIES TIMEOUT 60)
> 
>-    add_dependencies(TestWebKitLegacy TestWebKitLegacyLib)
>+    WEBKIT_WRAP_EXECUTABLE(TestWebKitLegacy
>+        SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+        LIBRARIES shlwapi
>+    )
>+    target_compile_definitions(TestWebKitLegacy PRIVATE ${wrapper_DEFINITIONS})
>+    set(TestWebKitLegacy_OUTPUT_NAME TestWebKitLegacy${DEBUG_SUFFIX})
> endif ()
> 
>+# TestWebKit
> if (ENABLE_WEBKIT)
>-    set(bundle_harness_SOURCES
>-        ${TESTWEBKITAPI_DIR}/win/UtilitiesWin.cpp
>-        ${TESTWEBKITAPI_DIR}/win/InjectedBundleControllerWin.cpp
>-        ${TESTWEBKITAPI_DIR}/win/PlatformUtilitiesWin.cpp
>+    add_dependencies(TestWebKitAPIBase WebKitFrameworkHeaders)
>+    add_dependencies(TestWebKitAPIInjectedBundle WebKitFrameworkHeaders)
>+
>+    target_sources(TestWebKitAPIInjectedBundle PRIVATE
>+        win/InjectedBundleControllerWin.cpp
>+        win/PlatformUtilitiesWin.cpp
>+        win/UtilitiesWin.cpp
>     )
> 
>-    set(webkit_api_harness_SOURCES
>-        ${TESTWEBKITAPI_DIR}/win/PlatformUtilitiesWin.cpp
>-        ${TESTWEBKITAPI_DIR}/win/PlatformWebViewWin.cpp
>-        ${TESTWEBKITAPI_DIR}/win/UtilitiesWin.cpp
>+    list(APPEND TestWebKit_SOURCES
>+        ${test_main_SOURCES}
>+
>+        win/PlatformUtilitiesWin.cpp
>+        win/PlatformWebViewWin.cpp
>+        win/UtilitiesWin.cpp
>     )
> 
>     if (${WTF_PLATFORM_WIN_CAIRO})
>-        list(APPEND test_webkit_api_SOURCES
>-            ${TESTWEBKITAPI_DIR}/Tests/WebKit/curl/Certificates.cpp
>+        list(APPEND TestWebKit_SOURCES
>+            Tests/WebKit/curl/Certificates.cpp
>         )
>     endif ()
> 
>-    add_library(TestWebKitLib SHARED
>-        ${TESTWEBKITAPI_DIR}/win/main.cpp
>-        ${test_webkit_api_SOURCES}
>+    list(APPEND TestWebKit_DEPENDENCIES
>+        WebKitFrameworkHeaders
>     )
> 
>-    target_link_libraries(TestWebKitLib ${test_webkit_api_LIBRARIES})
>-
>-    add_executable(TestWebKit
>-        ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+    WEBKIT_WRAP_EXECUTABLE(TestWebKit
>+        SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>+        LIBRARIES shlwapi
>     )
>-    target_link_libraries(TestWebKit shlwapi)
>-
>-    add_test(TestWebKit ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit)
>-    set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
>-    set_target_properties(TestWebKit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
>-
>-    add_dependencies(TestWebKit TestWebKitAPIBase WebKitFrameworkHeaders)
>+    target_compile_definitions(TestWebKit PRIVATE ${wrapper_DEFINITIONS})
>+    set(TestWebKit_OUTPUT_NAME TestWebKit${DEBUG_SUFFIX})
> endif ()
>-
>-set(test_main_SOURCES
>-    ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>-)
>-
>-add_dependencies(TestWebCore TestWebCoreLib)
>diff --git a/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp b/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp
>index 1ceb07ff275..0988306df84 100644
>--- a/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp
>@@ -25,10 +25,8 @@
> 
> #include "config.h"
> 
>-#if! PLATFORM(WIN)
>-#include "PlatformUtilities.h"
>-#endif
> #include "RefLogger.h"
>+#include "Utilities.h"
> #include <wtf/MainThread.h>
> #include <wtf/NeverDestroyed.h>
> #include <wtf/RefCounted.h>
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp
>index dcd4f3f00c2..6f915713c14 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp
>@@ -25,7 +25,7 @@
> 
> #include "config.h"
> 
>-#include "PlatformUtilities.h"
>+#include "Utilities.h"
> #include <JavaScriptCore/InitializeThreading.h>
> #include <WebCore/CombinedURLFilters.h>
> #include <WebCore/ContentExtensionCompiler.h>
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp b/Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp
>index e002df1ef09..1ed1328f813 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp
>@@ -25,8 +25,8 @@
> 
> #include "config.h"
> 
>-#include "PlatformUtilities.h"
> #include "Test.h"
>+#include "Utilities.h"
> #include "WTFStringUtilities.h"
> #include <WebCore/FileMonitor.h>
> #include <wtf/FileSystem.h>
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/LineBreaking.mm b/Tools/TestWebKitAPI/Tests/WebCore/LineBreaking.mm
>index 4d6d6b252e1..bee717e5718 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/LineBreaking.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/LineBreaking.mm
>@@ -25,8 +25,8 @@
> 
> #include "config.h"
> 
>-#import "PlatformUtilities.h"
> #import "TestNavigationDelegate.h"
>+#import "Utilities.h"
> #import <unicode/ubrk.h>
> #import <wtf/RetainPtr.h>
> #import <wtf/Vector.h>
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm
>index 18c06720551..297717d36e2 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm
>@@ -25,8 +25,8 @@
> 
> #import "config.h"
> 
>-#import "PlatformUtilities.h"
> #import "SharedBufferTest.h"
>+#import "Utilities.h"
> #import <WebCore/SharedBuffer.h>
> 
> using namespace WebCore;
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm
>index 607415d1389..918e105e610 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm
>@@ -27,7 +27,7 @@
> 
> #if !PLATFORM(IOS_FAMILY)
> 
>-#import "PlatformUtilities.h"
>+#import "Utilities.h"
> #import <JavaScriptCore/InitializeThreading.h>
> #import <WebCore/Frame.h>
> #import <WebCore/FrameLoadRequest.h>
>diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
>index b8c7966c830..4cb1f87709a 100644
>--- a/Tools/TestWebKitAPI/config.h
>+++ b/Tools/TestWebKitAPI/config.h
>@@ -27,11 +27,7 @@
> #include "cmakeconfig.h"
> #endif
> 
>-#include <JavaScriptCore/JSExportMacros.h>
>-#ifndef BUILDING_JSCONLY__
>-#include <WebCore/PlatformExportMacros.h>
>-#include <pal/ExportMacros.h>
>-#endif
>+#include <wtf/Platform.h>
> 
> #if defined(__APPLE__) && __APPLE__
> #ifdef __OBJC__
>@@ -43,12 +39,37 @@
> #endif
> #endif
> 
>-#include <stdint.h>
>+#if defined(BUILDING_WITH_CMAKE)
>+
>+// CMake path
>+#if defined(BUILDING_TestJSC)
>+#include <JavaScriptCore/JSExportMacros.h>
>+#endif
>+#if defined(BUILDING_TestWebCore)
>+#include <WebCore/PlatformExportMacros.h>
>+#include <pal/ExportMacros.h>
>+#endif
>+#if defined(BUILDING_TestWebKit)
>+#include <WebKit/WebKit2_C.h>
>+#endif
>+
>+#else
> 
>-#if !PLATFORM(IOS_FAMILY) && !defined(BUILDING_JSCONLY__) && (!PLATFORM(WIN) || PLATFORM(WIN_CAIRO))
>+// XCode path
>+#include <JavaScriptCore/JSExportMacros.h>
>+#include <WebCore/PlatformExportMacros.h>
>+#include <pal/ExportMacros.h>
>+#if !PLATFORM(IOS_FAMILY)
> #include <WebKit/WebKit2_C.h>
>+#endif
>+#if PLATFORM(COCOA) && defined(__OBJC__)
>+#import <WebKit/WebKit.h>
>+#endif
>+
> #endif
> 
>+#include <stdint.h>
>+
> #ifdef __clang__
> // Work around the less strict coding standards of the gtest framework.
> #pragma clang diagnostic push
>@@ -70,13 +91,6 @@
> #pragma clang diagnostic pop
> #endif
> 
>-#if PLATFORM(COCOA) && defined(__OBJC__)
>-// FIXME: Get Cocoa tests working with CMake on Mac.
>-#if !defined(BUILDING_WITH_CMAKE)
>-#import <WebKit/WebKit.h>
>-#endif
>-#endif
>-
> #if !PLATFORM(IOS_FAMILY) && !defined(BUILDING_JSCONLY__)
> #define WK_HAVE_C_SPI 1
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 196583: 368476 | 368478 | 368491 | 368493 | 368495 | 368497 | 368499 | 368500 | 368504 | 368506 | 368507 | 368510 | 368514 | 368572 | 368606 | 368616 | 368629 | 368641 | 368679 | 368726