[EFL] Move efl API test binaries to TestWebKitAPI/EWebKit|EWebKit2

https://bugs.webkit.org/show_bug.cgi?id=126615

Reviewed by Martin Robinson.

Now EFL API test binaries created in *bin* directory with other executables.
It would be good to move them to their folder. This patch moves them to
*TestWebKitAPI/EWebKit|EWebKit2* directories.

Source/WebKit:

* PlatformEfl.cmake:

Source/WebKit2:

* PlatformEfl.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161525 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ebaddf06
2014-01-08 Gyuyoung Kim <gyuyoung.kim@samsung.com>
[EFL] Move efl API test binaries to TestWebKitAPI/EWebKit|EWebKit2
https://bugs.webkit.org/show_bug.cgi?id=126615
Reviewed by Martin Robinson.
Now EFL API test binaries created in *bin* directory with other executables.
It would be good to move them to their folder. This patch moves them to
*TestWebKitAPI/EWebKit|EWebKit2* directories.
* PlatformEfl.cmake:
2014-01-08 Brent Fulgham <bfulgham@apple.com>
Unreviewed build fix.
......
......@@ -262,6 +262,7 @@ add_library(ewkTestUtils
target_link_libraries(ewkTestUtils ${EWKUnitTests_LIBRARIES})
set(WEBKIT_EFL_TEST_DIR "${WEBKIT_DIR}/efl/tests/")
set(WEBKIT_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/EWebKit)
set(EWKUnitTests_BINARIES
test_ewk_contextmenu
......@@ -273,10 +274,10 @@ set(EWKUnitTests_BINARIES
if (ENABLE_API_TESTS)
foreach (testName ${EWKUnitTests_BINARIES})
add_executable(${testName} ${WEBKIT_EFL_TEST_DIR}/${testName}.cpp ${WEBKIT_EFL_TEST_DIR}/test_runner.cpp)
add_test(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
add_test(${testName} ${WEBKIT_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY}/${testName})
set_tests_properties(${testName} PROPERTIES TIMEOUT 60)
set_target_properties(${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBKIT_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY})
target_link_libraries(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils)
set_target_properties(${testName} PROPERTIES FOLDER "WebKit")
endforeach ()
endif ()
2014-01-08 Gyuyoung Kim <gyuyoung.kim@samsung.com>
[EFL] Move efl API test binaries to TestWebKitAPI/EWebKit|EWebKit2
https://bugs.webkit.org/show_bug.cgi?id=126615
Reviewed by Martin Robinson.
Now EFL API test binaries created in *bin* directory with other executables.
It would be good to move them to their folder. This patch moves them to
*TestWebKitAPI/EWebKit|EWebKit2* directories.
* PlatformEfl.cmake:
2014-01-08 Anders Carlsson <andersca@apple.com>
Add WTF::StringView and use it for grammar checking
......
......@@ -443,6 +443,7 @@ set(EWK2UnitTests_LIBRARIES
set(WEBKIT2_EFL_TEST_DIR "${WEBKIT2_DIR}/UIProcess/API/efl/tests")
set(TEST_RESOURCES_DIR ${WEBKIT2_EFL_TEST_DIR}/resources)
set(TEST_INJECTED_BUNDLE_DIR ${WEBKIT2_EFL_TEST_DIR}/InjectedBundle)
set(WEBKIT2_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/EWebKit2)
add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
-DTEST_LIB_DIR=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
......@@ -496,8 +497,9 @@ set(EWK2UnitTests_BINARIES
if (ENABLE_API_TESTS)
foreach (testName ${EWK2UnitTests_BINARIES})
add_executable(${testName} ${WEBKIT2_EFL_TEST_DIR}/${testName}.cpp)
add_test(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
add_test(${testName} ${WEBKIT2_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY}/${testName})
set_tests_properties(${testName} PROPERTIES TIMEOUT 60)
set_target_properties(${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBKIT2_EFL_TEST_RUNTIME_OUTPUT_DIRECTORY})
target_link_libraries(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils)
endforeach ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment