Diff
Modified: trunk/CMakeLists.txt (122600 => 122601)
--- trunk/CMakeLists.txt 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/CMakeLists.txt 2012-07-13 17:25:14 UTC (rev 122601)
@@ -136,6 +136,13 @@
INCLUDE(Options${PORT})
# -----------------------------------------------------------------------------
+# Enable API unit tests and create a target for the test runner
+# -----------------------------------------------------------------------------
+IF (ENABLE_API_TESTS)
+ ENABLE_TESTING()
+ENDIF ()
+
+# -----------------------------------------------------------------------------
# Install _javascript_ shell
# -----------------------------------------------------------------------------
OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built _javascript_ shell")
Modified: trunk/ChangeLog (122600 => 122601)
--- trunk/ChangeLog 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/ChangeLog 2012-07-13 17:25:14 UTC (rev 122601)
@@ -1,3 +1,19 @@
+2012-07-13 Thiago Marcos P. Santos <[email protected]>
+
+ [CMake] Proper handling of ENABLE_API_TESTS build option
+ https://bugs.webkit.org/show_bug.cgi?id=91221
+
+ Reviewed by Rob Buis.
+
+ Make the flag reusable across the ports using CMake. We are about to enable the WTF,
+ WebCore and WebKit 2 API's at Tools/TestWebKitAPI and other ports using CMake can get
+ it almost for free.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2012-07-11 Matt Falkenhagen <[email protected]>
Add dialog element feature toggle to InternalSettings
Modified: trunk/Source/WebKit/ChangeLog (122600 => 122601)
--- trunk/Source/WebKit/ChangeLog 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/WebKit/ChangeLog 2012-07-13 17:25:14 UTC (rev 122601)
@@ -1,3 +1,14 @@
+2012-07-13 Thiago Marcos P. Santos <[email protected]>
+
+ [CMake] Proper handling of ENABLE_API_TESTS build option
+ https://bugs.webkit.org/show_bug.cgi?id=91221
+
+ Reviewed by Rob Buis.
+
+ Build unit tests only if ENABLE_API_TESTS is set.
+
+ * PlatformEfl.cmake:
+
2012-07-12 Simon Hausmann <[email protected]>
Typo in path in generate-webkitversion.pl
Modified: trunk/Source/WebKit/PlatformEfl.cmake (122600 => 122601)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-07-13 17:25:14 UTC (rev 122601)
@@ -350,13 +350,15 @@
test_ewk_view
)
-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})
- TARGET_LINK_LIBRARIES(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils gtest pthread)
- ADD_TARGET_PROPERTIES(${testName} LINK_FLAGS "${EWKUnitTests_LINK_FLAGS}")
- SET_TARGET_PROPERTIES(${testName} PROPERTIES FOLDER "WebKit")
-ENDFOREACH()
+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})
+ TARGET_LINK_LIBRARIES(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils gtest pthread)
+ ADD_TARGET_PROPERTIES(${testName} LINK_FLAGS "${EWKUnitTests_LINK_FLAGS}")
+ SET_TARGET_PROPERTIES(${testName} PROPERTIES FOLDER "WebKit")
+ ENDFOREACH ()
+ENDIF ()
IF (ENABLE_INSPECTOR)
SET(WEB_INSPECTOR_DIR ${CMAKE_BINARY_DIR}/WebKit/efl/webinspector)
Modified: trunk/Source/WebKit2/ChangeLog (122600 => 122601)
--- trunk/Source/WebKit2/ChangeLog 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-13 17:25:14 UTC (rev 122601)
@@ -1,3 +1,14 @@
+2012-07-13 Thiago Marcos P. Santos <[email protected]>
+
+ [CMake] Proper handling of ENABLE_API_TESTS build option
+ https://bugs.webkit.org/show_bug.cgi?id=91221
+
+ Reviewed by Rob Buis.
+
+ Build unit tests only if ENABLE_API_TESTS is set.
+
+ * PlatformEfl.cmake:
+
2012-07-13 Christophe Dumez <[email protected]>
[EFL][WK2] Make new public Ewk headers as installable
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (122600 => 122601)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-13 17:25:14 UTC (rev 122601)
@@ -220,9 +220,11 @@
test_ewk2_view
)
-FOREACH(testName ${EWK2UnitTests_BINARIES})
- ADD_EXECUTABLE(${testName} ${WEBKIT2_EFL_TEST_DIR}/${testName}.cpp)
- ADD_TEST(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
- SET_TESTS_PROPERTIES(${testName} PROPERTIES TIMEOUT 60)
- TARGET_LINK_LIBRARIES(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils gtest pthread)
-ENDFOREACH()
+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})
+ SET_TESTS_PROPERTIES(${testName} PROPERTIES TIMEOUT 60)
+ TARGET_LINK_LIBRARIES(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils gtest pthread)
+ ENDFOREACH ()
+ENDIF ()
Modified: trunk/Source/cmake/OptionsEfl.cmake (122600 => 122601)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-07-13 17:25:14 UTC (rev 122601)
@@ -16,12 +16,6 @@
SET(WTF_PLATFORM_EFL 1)
# -----------------------------------------------------------------------------
-# Enable CTest for the public API unit testing
-# -----------------------------------------------------------------------------
-ENABLE_TESTING()
-SET(ENABLE_API_TESTS ON)
-
-# -----------------------------------------------------------------------------
# Determine which font backend will be used
# -----------------------------------------------------------------------------
SET(ALL_FONT_BACKENDS freetype pango)
@@ -73,6 +67,7 @@
SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
WEBKIT_OPTION_BEGIN()
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (122600 => 122601)
--- trunk/Source/cmake/WebKitFeatures.cmake 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2012-07-13 17:25:14 UTC (rev 122601)
@@ -11,6 +11,7 @@
ENDMACRO ()
MACRO (WEBKIT_OPTION_BEGIN)
+ WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ANIMATION_API "Toggle animation API support" OFF)
Modified: trunk/Source/cmakeconfig.h.cmake (122600 => 122601)
--- trunk/Source/cmakeconfig.h.cmake 2012-07-13 17:24:42 UTC (rev 122600)
+++ trunk/Source/cmakeconfig.h.cmake 2012-07-13 17:25:14 UTC (rev 122601)
@@ -5,6 +5,7 @@
#cmakedefine WEBKIT_USER_AGENT_MINOR_VERSION @WEBKIT_USER_AGENT_MINOR_VERSION@
+#cmakedefine01 ENABLE_API_TESTS
#cmakedefine01 ENABLE_3D_RENDERING
#cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
#cmakedefine01 ENABLE_AS_IMAGE
