Changeset 220126 in webkit
- Timestamp:
- Aug 2, 2017 1:45:15 AM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r220125 r220126 1 2017-08-02 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [CMake] Remove obsolete code in TestWebKitAPI/CMakeLists.txt 4 https://bugs.webkit.org/show_bug.cgi?id=175019 5 6 Reviewed by Darin Adler. 7 8 * TestWebKitAPI/CMakeLists.txt: 9 1 10 2017-08-01 Csaba Osztrogonác <ossy@webkit.org> 2 11 -
trunk/Tools/TestWebKitAPI/CMakeLists.txt
r219865 r220126 184 184 ) 185 185 186 # FIXME: EFL is the only port that separates the WebCore binaries. Each port ought to do closer to the same thing.187 foreach (testName ${test_webcore_BINARIES})188 add_executable(${testName} ${test_main_SOURCES} ${TESTWEBKITAPI_DIR}/TestsController.cpp ${TESTWEBKITAPI_DIR}/Tests/WebCore/${testName}.cpp)189 add_test(${testName} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/${testName})190 set_tests_properties(${testName} PROPERTIES TIMEOUT 60)191 target_link_libraries(${testName} ${test_webcore_LIBRARIES})192 set_target_properties(${testName} PROPERTIES193 RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore194 )195 endforeach ()196 197 186 if (ENABLE_WEBKIT) 198 187 add_library(TestWebKitAPIBase … … 207 196 208 197 add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME}) 209 210 foreach (testName ${test_webkit2_api_BINARIES})211 get_filename_component(testBaseName ${testName} NAME)212 add_executable(${testBaseName} ${TESTWEBKITAPI_DIR}/Tests/WebKit/${testName}.cpp)213 add_test(${testBaseName} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/${testBaseName})214 set_tests_properties(${testBaseName} PROPERTIES TIMEOUT 60)215 target_link_libraries(${testBaseName} ${test_webkit2_api_LIBRARIES})216 set_target_properties(${testBaseName} PROPERTIES217 RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit218 )219 endforeach ()220 221 # We don't run tests that are expected to fail. We could use the WILL_FAIL222 # property, but it reports failure when the test crashes or timeouts and would223 # make the bot red.224 foreach (testName ${test_webkit2_api_fail_BINARIES})225 add_executable(${testName} ${TESTWEBKITAPI_DIR}/Tests/WebKit/${testName}.cpp)226 target_link_libraries(${testName} ${test_webkit2_api_LIBRARIES})227 set_target_properties(${testName} PROPERTIES228 RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/failure229 )230 endforeach ()231 198 endif ()
Note: See TracChangeset
for help on using the changeset viewer.