Changeset 161525 in webkit

Timestamp:

Jan 8, 2014 4:35:34 PM (10 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

[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:

Location:

trunk/Source

Files:

• WebKit/ChangeLog (modified) (1 diff)
• WebKit/PlatformEfl.cmake (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/PlatformEfl.cmake (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

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

trunk/Source/WebKit/PlatformEfl.cmake

@@ -263 +263 @@
 
 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
@@ -274 +275 @@
     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 ()

trunk/Source/WebKit2/ChangeLog

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

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -444 +444 @@
 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}\"
@@ -497 +498 @@
     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 ()