Title: [168615] trunk/Tools
- Revision
- 168615
- Author
- carlo...@webkit.org
- Date
- 2014-05-12 01:57:58 -0700 (Mon, 12 May 2014)
Log Message
REGRESSION(CMAKE): [GTK] _javascript_Core 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 _javascript_Core unit tests.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (168614 => 168615)
--- trunk/Tools/ChangeLog 2014-05-12 08:46:52 UTC (rev 168614)
+++ trunk/Tools/ChangeLog 2014-05-12 08:57:58 UTC (rev 168615)
@@ -1,3 +1,14 @@
+2014-05-12 Carlos Garcia Campos <cgar...@igalia.com>
+
+ REGRESSION(CMAKE): [GTK] _javascript_Core 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 _javascript_Core unit tests.
+
2014-05-11 Anders Carlsson <ander...@apple.com>
Add a WKContextConfigurationRef object and make the injected bundle path part of the configuration
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (168614 => 168615)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-05-12 08:46:52 UTC (rev 168614)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-05-12 08:57:58 UTC (rev 168615)
@@ -3,12 +3,20 @@
include_directories(${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
- ${TESTWEBKITAPI_DIR}
${CMAKE_SOURCE_DIR}/Source
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
${DERIVED_SOURCES_WEBCORE_DIR}
${_javascript_CORE_DIR}
${_javascript_CORE_DIR}/API
${_javascript_CORE_DIR}/ForwardingHeaders
+ ${_javascript_CORE_DIR}/assembler
+ ${_javascript_CORE_DIR}/bytecode
+ ${_javascript_CORE_DIR}/disassembler
+ ${_javascript_CORE_DIR}/heap
+ ${_javascript_CORE_DIR}/jit
+ ${_javascript_CORE_DIR}/llint
+ ${_javascript_CORE_DIR}/parser
+ ${_javascript_CORE_DIR}/runtime
${THIRDPARTY_DIR}/gtest/include
${WEBCORE_DIR}/editing
${WEBCORE_DIR}/platform
@@ -50,6 +58,11 @@
WebKit2
)
+set(TestJavaScriptCore_LIBRARIES
+ gtest
+ _javascript_Core
+)
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
add_library(TestWebKitAPIInjectedBundle SHARED
@@ -136,6 +149,18 @@
RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF
)
+
+add_executable(TestJavaScriptCore
+ ${test_main_SOURCES}
+ ${TESTWEBKITAPI_DIR}/TestsController.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/_javascript_Core/VMInspector.cpp
+)
+
+target_link_libraries(TestJavaScriptCore ${TestJavaScriptCore_LIBRARIES})
+add_test(TestJavaScriptCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/_javascript_Core/TestJavaScriptCore)
+set_tests_properties(TestJavaScriptCore PROPERTIES TIMEOUT 60)
+set_target_properties(TestJavaScriptCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/_javascript_Core)
+
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})
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (168614 => 168615)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-05-12 08:46:52 UTC (rev 168614)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-05-12 08:57:58 UTC (rev 168615)
@@ -55,6 +55,11 @@
${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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
