Title: [154071] trunk
Revision
154071
Author
[email protected]
Date
2013-08-14 14:00:39 -0700 (Wed, 14 Aug 2013)

Log Message

[GTK] [CMake] Add support for building TestWebKitAPI
https://bugs.webkit.org/show_bug.cgi?id=116987

Reviewed by Philippe Normand.

.:

* Source/cmake/OptionsGTK.cmake: Turn on the API tests in the settings.

Tools:

* TestWebKitAPI/CMakeLists.txt: Move the library listings to before the inclusion of the
platform-specific file, so that GTK+ can override them.
* TestWebKitAPI/PlatformGTK.cmake: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/ChangeLog (154070 => 154071)


--- trunk/ChangeLog	2013-08-14 20:43:16 UTC (rev 154070)
+++ trunk/ChangeLog	2013-08-14 21:00:39 UTC (rev 154071)
@@ -1,3 +1,12 @@
+2013-08-14  Martin Robinson  <[email protected]>
+
+        [GTK] [CMake] Add support for building TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=116987
+
+        Reviewed by Philippe Normand.
+
+        * Source/cmake/OptionsGTK.cmake: Turn on the API tests in the settings.
+
 2013-08-13  Zan Dobersek  <[email protected]>
 
         [Autotools] Unicode's CFLAGS enforce -D_FORTIFY_SOURCE=2, -D_REENTRANT=1, causing faulty Clang builds

Modified: trunk/Source/cmake/OptionsGTK.cmake (154070 => 154071)


--- trunk/Source/cmake/OptionsGTK.cmake	2013-08-14 20:43:16 UTC (rev 154070)
+++ trunk/Source/cmake/OptionsGTK.cmake	2013-08-14 21:00:39 UTC (rev 154071)
@@ -4,7 +4,7 @@
 WEBKIT_OPTION_BEGIN()
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)

Modified: trunk/Tools/ChangeLog (154070 => 154071)


--- trunk/Tools/ChangeLog	2013-08-14 20:43:16 UTC (rev 154070)
+++ trunk/Tools/ChangeLog	2013-08-14 21:00:39 UTC (rev 154071)
@@ -1,3 +1,14 @@
+2013-08-14  Martin Robinson  <[email protected]>
+
+        [GTK] [CMake] Add support for building TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=116987
+
+        Reviewed by Philippe Normand.
+
+        * TestWebKitAPI/CMakeLists.txt: Move the library listings to before the inclusion of the
+        platform-specific file, so that GTK+ can override them.
+        * TestWebKitAPI/PlatformGTK.cmake: Added.
+
 2013-08-14  Brent Fulgham  <[email protected]>
 
         [Windows] Simplify Setting WebKit Debugging Options in WinLauncher

Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (154070 => 154071)


--- trunk/Tools/TestWebKitAPI/CMakeLists.txt	2013-08-14 20:43:16 UTC (rev 154070)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt	2013-08-14 21:00:39 UTC (rev 154071)
@@ -23,6 +23,25 @@
     ${WTF_DIR}
 )
 
+set(test_wtf_LIBRARIES
+    WTF
+    gtest
+)
+
+set(test_webcore_LIBRARIES
+    gtest
+    WTF
+    WebCore
+)
+
+set(test_webkit2_api_LIBRARIES
+    TestWebKitAPIBase
+    WTF
+    _javascript_Core
+    WebKit2
+    gtest
+)
+
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 add_library(TestWebKitAPIInjectedBundle SHARED
@@ -70,11 +89,6 @@
     -DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
 )
 
-set(test_wtf_LIBRARIES
-    WTF
-    gtest
-)
-
 add_executable(test_wtf
     ${test_main_SOURCES}
     ${TESTWEBKITAPI_DIR}/TestsController.cpp
@@ -107,12 +121,6 @@
 add_test(test_wtf ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_wtf)
 set_tests_properties(test_wtf PROPERTIES TIMEOUT 60)
 
-set(test_webcore_LIBRARIES
-    gtest
-    WTF
-    WebCore
-)
-
 foreach (testName ${test_webcore_BINARIES})
     add_executable(test_webcore_${testName} ${test_main_SOURCES} ${TESTWEBKITAPI_DIR}/TestsController.cpp ${TESTWEBKITAPI_DIR}/Tests/WebCore/${testName}.cpp)
     add_test(test_webcore_${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_webcore_${testName})
@@ -130,14 +138,6 @@
 
 add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
 
-set(test_webkit2_api_LIBRARIES
-    TestWebKitAPIBase
-    WTF
-    _javascript_Core
-    WebKit2
-    gtest
-)
-
 foreach (testName ${test_webkit2_api_BINARIES})
     get_filename_component(testBaseName ${testName} NAME)
     add_executable(test_webkit2_api_${testBaseName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)

Added: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (0 => 154071)


--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	                        (rev 0)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2013-08-14 21:00:39 UTC (rev 154071)
@@ -0,0 +1,114 @@
+# This is necessary because it is possible to build TestWebKitAPI with WebKit2
+# disabled and this triggers the inclusion of the WebKit2 headers.
+add_definitions(-DBUILDING_WEBKIT2__)
+
+add_custom_target(forwarding-headersGTKForTestWebKitAPI
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
+)
+set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersGTKForTestWebKitAPI)
+
+add_custom_target(forwarding-headersSoupForTestWebKitAPI
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+)
+set(ForwardingNetworkHeadersForTestWebKitAPI_NAME forwarding-headersSoupForTestWebKitAPI)
+
+include_directories(
+    ${WEBKIT2_DIR}/UIProcess/API/C/soup
+    ${WEBKIT2_DIR}/UIProcess/API/C/gtk
+    ${WEBKIT2_DIR}/UIProcess/API/gtk
+    ${GDK3_INCLUDE_DIRS}
+    ${GLIB_INCLUDE_DIRS}
+    ${GTK3_INCLUDE_DIRS}
+    ${LIBSOUP_INCLUDE_DIRS}
+)
+set(test_main_SOURCES
+    ${TESTWEBKITAPI_DIR}/gtk/main.cpp
+)
+
+set(bundle_harness_SOURCES
+    ${TESTWEBKITAPI_DIR}/gtk/InjectedBundleControllerGtk.cpp
+    ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp
+)
+
+set(webkit2_api_harness_SOURCES
+    ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp
+    ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
+    ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
+    ../../Source/WebCore/platform/gtk/GOwnPtrGtk.cpp
+)
+
+list(APPEND test_wtf_LIBRARIES
+    ${GDK3_LIBRARIES}
+    ${GTK3_LIBRARIES}
+)
+
+list(APPEND test_webkit2_api_LIBRARIES
+    ${GDK3_LIBRARIES}
+    ${GTK3_LIBRARIES}
+)
+
+list(APPEND test_webcore_LIBRARIES
+    ${GDK3_LIBRARIES}
+    ${GTK3_LIBRARIES}
+)
+
+# 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
+# are compiled and suffixed with fail and skipped from the test runner.
+#
+# Make sure that the tests are passing on both Debug and
+# Release builds before adding it to test_{webkit2_api|webcore}_BINARIES.
+
+set(test_webcore_BINARIES
+    LayoutUnit
+    KURL
+)
+
+set(test_webkit2_api_BINARIES
+    AboutBlankLoad
+    CanHandleRequest
+    CookieManager
+    DocumentStartUserScriptAlertCrash
+    DOMWindowExtensionBasic
+    DOMWindowExtensionNoCache
+    DownloadDecideDestinationCrash
+    EvaluateJavaScript
+    FailedLoad
+    Find
+    ForceRepaint
+    FrameMIMETypeHTML
+    FrameMIMETypePNG
+    GetInjectedBundleInitializationUserDataCallback
+    HitTestResultNodeHandle
+    InjectedBundleBasic
+    InjectedBundleFrameHitTest
+    InjectedBundleInitializationUserDataCallbackWins
+    LoadAlternateHTMLStringWithNonDirectoryURL
+    LoadCanceledNoServerRedirectCallback
+    LoadPageOnCrash
+    MouseMoveAfterCrash
+    NewFirstVisuallyNonEmptyLayout
+    NewFirstVisuallyNonEmptyLayoutFails
+    NewFirstVisuallyNonEmptyLayoutForImages
+    NewFirstVisuallyNonEmptyLayoutFrames
+    PageLoadBasic
+    PageLoadDidChangeLocationWithinPageForFrame
+    ParentFrame
+    PreventEmptyUserAgent
+    PrivateBrowsingPushStateNoHistoryCallback
+    ReloadPageAfterCrash
+    ResizeWindowAfterCrash
+    RestoreSessionStateContainingFormData
+    ShouldGoToBackForwardListItem
+    UserMessage
+    WillSendSubmitEvent
+    WKConnection
+    WKPageGetScaleFactorNotZero
+    WKPreferences
+    WKString
+    WKStringJSString
+    WKURL
+)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to