Changeset 168615 in webkit

Timestamp:

May 12, 2014 1:57:58 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/CMakeLists.txt (modified) (3 diffs)
• TestWebKitAPI/PlatformGTK.cmake (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/TestWebKitAPI/CMakeLists.txt

@@ -4 +4 @@
 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
@@ -49 +57 @@
     WTF
     WebKit2
+)
+
+set(TestJavaScriptCore_LIBRARIES
+    gtest
+    JavaScriptCore
 )
 
@@ -137 +150 @@
     )
 
+
+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)

trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

@@ -52 +52 @@
 
 list(APPEND TestWebKitAPI_LIBRARIES
+    ${GDK3_LIBRARIES}
+    ${GTK3_LIBRARIES}
+)
+
+list(APPEND TestJavaScriptCore_LIBRARIES
     ${GDK3_LIBRARIES}
     ${GTK3_LIBRARIES}