REGRESSION(CMAKE): [GTK] JavaScriptCore API tests are not built anymore
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 May 2014 08:57:58 +0000 (08:57 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 May 2014 08:57:58 +0000 (08:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132739

Reviewed Anders Carlsson.

* TestWebKitAPI/CMakeLists.txt: Add missing includes required by
the JSC unit tests.
* TestWebKitAPI/PlatformGTK.cmake: Bring back JavaScriptCore unit tests.

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

Tools/ChangeLog
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformGTK.cmake

index 5fc2f5d..1b780d8 100644 (file)
@@ -1,3 +1,14 @@
+2014-05-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(CMAKE): [GTK] JavaScriptCore API tests are not built anymore
+        https://bugs.webkit.org/show_bug.cgi?id=132739
+
+        Reviewed Anders Carlsson.
+
+        * TestWebKitAPI/CMakeLists.txt: Add missing includes required by
+        the JSC unit tests.
+        * TestWebKitAPI/PlatformGTK.cmake: Bring back JavaScriptCore unit tests.
+
 2014-05-11  Anders Carlsson  <andersca@apple.com>
 
         Add a WKContextConfigurationRef object and make the injected bundle path part of the configuration
index 85490e0..300b9d0 100644 (file)
@@ -3,12 +3,20 @@ set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Te
 
 include_directories(${CMAKE_BINARY_DIR}
     ${TESTWEBKITAPI_DIR}
-    ${TESTWEBKITAPI_DIR}
     ${CMAKE_SOURCE_DIR}/Source
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
     ${DERIVED_SOURCES_WEBCORE_DIR}
     ${JAVASCRIPTCORE_DIR}
     ${JAVASCRIPTCORE_DIR}/API
     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
+    ${JAVASCRIPTCORE_DIR}/assembler
+    ${JAVASCRIPTCORE_DIR}/bytecode
+    ${JAVASCRIPTCORE_DIR}/disassembler
+    ${JAVASCRIPTCORE_DIR}/heap
+    ${JAVASCRIPTCORE_DIR}/jit
+    ${JAVASCRIPTCORE_DIR}/llint
+    ${JAVASCRIPTCORE_DIR}/parser
+    ${JAVASCRIPTCORE_DIR}/runtime
     ${THIRDPARTY_DIR}/gtest/include
     ${WEBCORE_DIR}/editing
     ${WEBCORE_DIR}/platform
@@ -50,6 +58,11 @@ set(TestWebKitAPI_LIBRARIES
     WebKit2
 )
 
+set(TestJavaScriptCore_LIBRARIES
+    gtest
+    JavaScriptCore
+)
+
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 add_library(TestWebKitAPIInjectedBundle SHARED
@@ -136,6 +149,18 @@ set_tests_properties(TestWTF PROPERTIES TIMEOUT 60)
         RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF
     )
 
+
+add_executable(TestJavaScriptCore
+    ${test_main_SOURCES}
+    ${TESTWEBKITAPI_DIR}/TestsController.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/JavaScriptCore/VMInspector.cpp
+)
+
+target_link_libraries(TestJavaScriptCore ${TestJavaScriptCore_LIBRARIES})
+add_test(TestJavaScriptCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore/TestJavaScriptCore)
+set_tests_properties(TestJavaScriptCore PROPERTIES TIMEOUT 60)
+set_target_properties(TestJavaScriptCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)
+
 foreach (testName ${test_webcore_BINARIES})
     add_executable(${testName} ${test_main_SOURCES} ${TESTWEBKITAPI_DIR}/TestsController.cpp ${TESTWEBKITAPI_DIR}/Tests/WebCore/${testName}.cpp)
     add_test(${testName} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/${testName})
index 938ea9f..cfb92b2 100644 (file)
@@ -55,6 +55,11 @@ list(APPEND TestWebKitAPI_LIBRARIES
     ${GTK3_LIBRARIES}
 )
 
+list(APPEND TestJavaScriptCore_LIBRARIES
+    ${GDK3_LIBRARIES}
+    ${GTK3_LIBRARIES}
+)
+
 add_executable(TestWebKit2
     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/AboutBlankLoad.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest.cpp