Changeset 122601 in webkit


Ignore:
Timestamp:
Jul 13, 2012 10:25:14 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[CMake] Proper handling of ENABLE_API_TESTS build option
​https://bugs.webkit.org/show_bug.cgi?id=91221

Patch by Thiago Marcos P. Santos <​thiago.santos@intel.com> on 2012-07-13
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:

Source/WebKit:

Build unit tests only if ENABLE_API_TESTS is set.

  • PlatformEfl.cmake:

Source/WebKit2:

Build unit tests only if ENABLE_API_TESTS is set.

  • PlatformEfl.cmake:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r121990 r122601  
    137137
    138138# -----------------------------------------------------------------------------
     139# Enable API unit tests and create a target for the test runner
     140# -----------------------------------------------------------------------------
     141IF (ENABLE_API_TESTS)
     142    ENABLE_TESTING()
     143ENDIF ()
     144
     145# -----------------------------------------------------------------------------
    139146# Install JavaScript shell
    140147# -----------------------------------------------------------------------------

  • trunk/ChangeLog

    r122420 r122601  
     12012-07-13  Thiago Marcos P. Santos  <thiago.santos@intel.com>
     2
     3        [CMake] Proper handling of ENABLE_API_TESTS build option
     4        https://bugs.webkit.org/show_bug.cgi?id=91221
     5
     6        Reviewed by Rob Buis.
     7
     8        Make the flag reusable across the ports using CMake. We are about to enable the WTF,
     9        WebCore and WebKit 2 API's at Tools/TestWebKitAPI and other ports using CMake can get
     10        it almost for free.
     11
     12        * CMakeLists.txt:
     13        * Source/cmake/OptionsEfl.cmake:
     14        * Source/cmake/WebKitFeatures.cmake:
     15        * Source/cmakeconfig.h.cmake:
     16
    1172012-07-11  Matt Falkenhagen  <falken@chromium.org>
    218

  • trunk/Source/WebKit/ChangeLog

    r122427 r122601  
     12012-07-13  Thiago Marcos P. Santos  <thiago.santos@intel.com>
     2
     3        [CMake] Proper handling of ENABLE_API_TESTS build option
     4        https://bugs.webkit.org/show_bug.cgi?id=91221
     5
     6        Reviewed by Rob Buis.
     7
     8        Build unit tests only if ENABLE_API_TESTS is set.
     9
     10        * PlatformEfl.cmake:
     11
    1122012-07-12  Simon Hausmann  <simon.hausmann@nokia.com>
    213

  • trunk/Source/WebKit/PlatformEfl.cmake

    r122197 r122601  
    351351)
    352352
    353 FOREACH(testName ${EWKUnitTests_BINARIES})
    354     ADD_EXECUTABLE(${testName} ${WEBKIT_EFL_TEST_DIR}/${testName}.cpp ${WEBKIT_EFL_TEST_DIR}/test_runner.cpp)
    355     ADD_TEST(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
    356     TARGET_LINK_LIBRARIES(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils gtest pthread)
    357     ADD_TARGET_PROPERTIES(${testName} LINK_FLAGS "${EWKUnitTests_LINK_FLAGS}")
    358     SET_TARGET_PROPERTIES(${testName} PROPERTIES FOLDER "WebKit")
    359 ENDFOREACH()
     353IF (ENABLE_API_TESTS)
     354    FOREACH (testName ${EWKUnitTests_BINARIES})
     355        ADD_EXECUTABLE(${testName} ${WEBKIT_EFL_TEST_DIR}/${testName}.cpp ${WEBKIT_EFL_TEST_DIR}/test_runner.cpp)
     356        ADD_TEST(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
     357        TARGET_LINK_LIBRARIES(${testName} ${EWKUnitTests_LIBRARIES} ewkTestUtils gtest pthread)
     358        ADD_TARGET_PROPERTIES(${testName} LINK_FLAGS "${EWKUnitTests_LINK_FLAGS}")
     359        SET_TARGET_PROPERTIES(${testName} PROPERTIES FOLDER "WebKit")
     360    ENDFOREACH ()
     361ENDIF ()
    360362
    361363IF (ENABLE_INSPECTOR)

  • trunk/Source/WebKit2/ChangeLog

    r122597 r122601  
     12012-07-13  Thiago Marcos P. Santos  <thiago.santos@intel.com>
     2
     3        [CMake] Proper handling of ENABLE_API_TESTS build option
     4        https://bugs.webkit.org/show_bug.cgi?id=91221
     5
     6        Reviewed by Rob Buis.
     7
     8        Build unit tests only if ENABLE_API_TESTS is set.
     9
     10        * PlatformEfl.cmake:
     11
    1122012-07-13  Christophe Dumez  <christophe.dumez@intel.com>
    213

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r122597 r122601  
    221221)
    222222
    223 FOREACH(testName ${EWK2UnitTests_BINARIES})
    224     ADD_EXECUTABLE(${testName} ${WEBKIT2_EFL_TEST_DIR}/${testName}.cpp)
    225     ADD_TEST(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
    226     SET_TESTS_PROPERTIES(${testName} PROPERTIES TIMEOUT 60)
    227     TARGET_LINK_LIBRARIES(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils gtest pthread)
    228 ENDFOREACH()
     223IF (ENABLE_API_TESTS)
     224    FOREACH (testName ${EWK2UnitTests_BINARIES})
     225        ADD_EXECUTABLE(${testName} ${WEBKIT2_EFL_TEST_DIR}/${testName}.cpp)
     226        ADD_TEST(${testName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testName})
     227        SET_TESTS_PROPERTIES(${testName} PROPERTIES TIMEOUT 60)
     228        TARGET_LINK_LIBRARIES(${testName} ${EWK2UnitTests_LIBRARIES} ewk2UnitTestUtils gtest pthread)
     229    ENDFOREACH ()
     230ENDIF ()

  • trunk/Source/cmake/OptionsEfl.cmake

    r121990 r122601  
    1515ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
    1616SET(WTF_PLATFORM_EFL 1)
    17 
    18 # -----------------------------------------------------------------------------
    19 # Enable CTest for the public API unit testing
    20 # -----------------------------------------------------------------------------
    21 ENABLE_TESTING()
    22 SET(ENABLE_API_TESTS ON)
    2317
    2418# -----------------------------------------------------------------------------
    … …  
    7468
    7569WEBKIT_OPTION_BEGIN()
     70WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
    7671WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
    7772WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r122274 r122601  
    1212
    1313MACRO (WEBKIT_OPTION_BEGIN)
     14    WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
    1415    WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
    1516    WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)

  • trunk/Source/cmakeconfig.h.cmake

    r122274 r122601  
    66
    77
     8#cmakedefine01 ENABLE_API_TESTS
    89#cmakedefine01 ENABLE_3D_RENDERING
    910#cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
Note: See TracChangeset for help on using the changeset viewer.