[webkit-changes] [168574] trunk/Tools

Sat, 10 May 2014 00:17:31 -0700

Title: [168574] trunk/Tools
Revision
168574
Author
[email protected]
Date
2014-05-10 00:17:00 -0700 (Sat, 10 May 2014)

Log Message

REGRESSION(CMAKE): [GTK] WebKit2 C API tests are not longer built in the same binary
https://bugs.webkit.org/show_bug.cgi?id=132685

Reviewed by Martin Robinson.

Use a single TestWebKit2 binary for all WebKit2 C API tests.

* TestWebKitAPI/PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (168573 => 168574)


--- trunk/Tools/ChangeLog	2014-05-10 06:48:51 UTC (rev 168573)
+++ trunk/Tools/ChangeLog	2014-05-10 07:17:00 UTC (rev 168574)
@@ -1,3 +1,14 @@
+2014-05-10  Carlos Garcia Campos  <[email protected]>
+
+        REGRESSION(CMAKE): [GTK] WebKit2 C API tests are not longer built in the same binary
+        https://bugs.webkit.org/show_bug.cgi?id=132685
+
+        Reviewed by Martin Robinson.
+
+        Use a single TestWebKit2 binary for all WebKit2 C API tests.
+
+        * TestWebKitAPI/PlatformGTK.cmake:
+
 2014-05-09  Benjamin Poulain  <[email protected]>
 
         [iOS] Switch geolocation to an explicit authorization query model

Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (168573 => 168574)


--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2014-05-10 06:48:51 UTC (rev 168573)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2014-05-10 07:17:00 UTC (rev 168574)
@@ -32,7 +32,6 @@
 set(webkit2_api_harness_SOURCES
     ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp
     ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
-    ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
 )
 
 list(APPEND test_wtf_LIBRARIES
@@ -56,6 +55,57 @@
     ${GTK3_LIBRARIES}
 )
 
+add_executable(TestWebKit2
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/AboutBlankLoad.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CookieManager.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DownloadDecideDestinationCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/EvaluateJavaScript.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FailedLoad.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/Find.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ForceRepaint.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FrameMIMETypeHTML.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FrameMIMETypePNG.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/Geolocation.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadPageOnCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PageLoadBasic.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PreventEmptyUserAgent.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ReloadPageAfterCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResizeWindowAfterCrash.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPreferences.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKString.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKStringJSString.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKURL.cpp
+)
+
+target_link_libraries(TestWebKit2 ${test_webkit2_api_LIBRARIES})
+add_test(TestWebKit2 ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/TestWebKit2)
+set_tests_properties(TestWebKit2 PROPERTIES TIMEOUT 60)
+set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
+
 # The list below works like a test expectation. Tests in the
 # test_{webkit2_api|webcore}_BINARIES list are added to the test runner and
 # tried on the bots on every build. Tests in test_{webkit2_api|webcore}_BINARIES
@@ -69,48 +119,3 @@
     URL
 )
 
-set(test_webkit2_api_BINARIES
-    AboutBlankLoad
-    CanHandleRequest
-    CookieManager
-    DocumentStartUserScriptAlertCrash
-    DOMWindowExtensionBasic
-    DOMWindowExtensionNoCache
-    DownloadDecideDestinationCrash
-    EvaluateJavaScript
-    FailedLoad
-    Find
-    ForceRepaint
-    FrameMIMETypeHTML
-    FrameMIMETypePNG
-    Geolocation
-    GetInjectedBundleInitializationUserDataCallback
-    HitTestResultNodeHandle
-    InjectedBundleBasic
-    InjectedBundleFrameHitTest
-    InjectedBundleInitializationUserDataCallbackWins
-    LoadAlternateHTMLStringWithNonDirectoryURL
-    LoadCanceledNoServerRedirectCallback
-    LoadPageOnCrash
-    MouseMoveAfterCrash
-    NewFirstVisuallyNonEmptyLayout
-    NewFirstVisuallyNonEmptyLayoutFails
-    NewFirstVisuallyNonEmptyLayoutForImages
-    NewFirstVisuallyNonEmptyLayoutFrames
-    PageLoadBasic
-    PageLoadDidChangeLocationWithinPageForFrame
-    ParentFrame
-    PreventEmptyUserAgent
-    PrivateBrowsingPushStateNoHistoryCallback
-    ReloadPageAfterCrash
-    ResizeWindowAfterCrash
-    RestoreSessionStateContainingFormData
-    ShouldGoToBackForwardListItem
-    UserMessage
-    WillSendSubmitEvent
-    WKPageGetScaleFactorNotZero
-    WKPreferences
-    WKString
-    WKStringJSString
-    WKURL
-)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to