Title: [161262] trunk/Tools
- Revision
- 161262
- Author
- [email protected]
- Date
- 2014-01-03 09:02:16 -0800 (Fri, 03 Jan 2014)
Log Message
[CMake] Build TestWebKitAPI tests into a directory structure
https://bugs.webkit.org/show_bug.cgi?id=126358
Reviewed by Gyuyoung Kim.
WebKitGTK+ builds the TestWebKitAPI tests into a "TestWebKitAPI" directory. This
is useful for keeping the "bin" directory tidy during building and will make it easier
to integrate the CMake build into the existing WebKitGTK+ scripts.
* TestWebKitAPI/CMakeLists.txt: Set the output directory of all TestWebKitAPI binaries
and make the names simpler now that the directory identifies what category the test is in.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (161261 => 161262)
--- trunk/Tools/ChangeLog 2014-01-03 17:00:50 UTC (rev 161261)
+++ trunk/Tools/ChangeLog 2014-01-03 17:02:16 UTC (rev 161262)
@@ -1,3 +1,17 @@
+2014-01-03 Martin Robinson <[email protected]>
+
+ [CMake] Build TestWebKitAPI tests into a directory structure
+ https://bugs.webkit.org/show_bug.cgi?id=126358
+
+ Reviewed by Gyuyoung Kim.
+
+ WebKitGTK+ builds the TestWebKitAPI tests into a "TestWebKitAPI" directory. This
+ is useful for keeping the "bin" directory tidy during building and will make it easier
+ to integrate the CMake build into the existing WebKitGTK+ scripts.
+
+ * TestWebKitAPI/CMakeLists.txt: Set the output directory of all TestWebKitAPI binaries
+ and make the names simpler now that the directory identifies what category the test is in.
+
2014-01-03 Alexey Proskuryakov <[email protected]>
Provide a visual clue when element has a popover at build.webkit.org/dashboard
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (161261 => 161262)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-01-03 17:00:50 UTC (rev 161261)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-01-03 17:02:16 UTC (rev 161262)
@@ -1,4 +1,5 @@
set(TESTWEBKITAPI_DIR "${TOOLS_DIR}/TestWebKitAPI")
+set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI")
include_directories(${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
@@ -90,7 +91,7 @@
-DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
)
-add_executable(test_wtf
+add_executable(TestWTF
${test_main_SOURCES}
${TESTWEBKITAPI_DIR}/TestsController.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/AtomicString.cpp
@@ -117,16 +118,22 @@
${TESTWEBKITAPI_DIR}/Tests/WTF/WTFString.cpp
)
-target_link_libraries(test_wtf ${test_wtf_LIBRARIES})
-add_dependencies(test_wtf ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
-add_test(test_wtf ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_wtf)
-set_tests_properties(test_wtf PROPERTIES TIMEOUT 60)
+target_link_libraries(TestWTF ${test_wtf_LIBRARIES})
+add_dependencies(TestWTF ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
+add_test(TestWTF ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF/TestWTF)
+set_tests_properties(TestWTF PROPERTIES TIMEOUT 60)
+ set_target_properties(TestWTF PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WTF
+ )
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})
- set_tests_properties(test_webcore_${testName} PROPERTIES TIMEOUT 60)
- target_link_libraries(test_webcore_${testName} ${test_webcore_LIBRARIES})
+ 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})
+ set_tests_properties(${testName} PROPERTIES TIMEOUT 60)
+ target_link_libraries(${testName} ${test_webcore_LIBRARIES})
+ set_target_properties(${testName} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore
+ )
endforeach ()
add_library(TestWebKitAPIBase
@@ -141,10 +148,13 @@
foreach (testName ${test_webkit2_api_BINARIES})
get_filename_component(testBaseName ${testName} NAME)
- add_executable(test_webkit2_api_${testBaseName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)
- add_test(test_webkit2_api_${testBaseName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_webkit2_api_${testBaseName})
- set_tests_properties(test_webkit2_api_${testBaseName} PROPERTIES TIMEOUT 60)
- target_link_libraries(test_webkit2_api_${testBaseName} ${test_webkit2_api_LIBRARIES})
+ add_executable(${testBaseName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)
+ add_test(${testBaseName} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/${testBaseName})
+ set_tests_properties(${testBaseName} PROPERTIES TIMEOUT 60)
+ target_link_libraries(${testBaseName} ${test_webkit2_api_LIBRARIES})
+ set_target_properties(${testBaseName} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2
+ )
endforeach ()
# We don't run tests that are expected to fail. We could use the WILL_FAIL
@@ -152,6 +162,9 @@
# make the bot red.
foreach (testName ${test_webkit2_api_fail_BINARIES})
- add_executable(test_webkit2_api_fail_${testName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)
- target_link_libraries(test_webkit2_api_fail_${testName} ${test_webkit2_api_LIBRARIES})
+ add_executable(${testName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)
+ target_link_libraries(${testName} ${test_webkit2_api_LIBRARIES})
+ set_target_properties(${testBaseName} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2
+ )
endforeach ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
