diff options
| author | Brad King <brad.king@kitware.com> | 2009-01-05 19:14:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-01-05 19:14:25 (GMT) |
| commit | b5f3d4be61a9613abc7288f1cf31248412bfc50d (patch) | |
| tree | 2e336218243e2102ab740a808d2707ae64df8bbc /Tests/CMakeLists.txt | |
| parent | 2703d51b8f382f3d20abe409b116eb0afd5051ff (diff) | |
| download | CMake-b5f3d4be61a9613abc7288f1cf31248412bfc50d.zip CMake-b5f3d4be61a9613abc7288f1cf31248412bfc50d.tar.gz CMake-b5f3d4be61a9613abc7288f1cf31248412bfc50d.tar.bz2 | |
ENH: Re-enable new 'testing' test mode
This fixes selection of a configuration when none is specified to find
an available configuration of the ctest test-command.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 71dfb0d..ca87201 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -14,9 +14,11 @@ MACRO(ADD_TEST_MACRO NAME COMMAND) ENDMACRO(ADD_TEST_MACRO) # Make sure the 'testing' test gets a proper configuration. -#SET_DIRECTORY_PROPERTIES(PROPERTIES -# TEST_INCLUDE_FILE "${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake" -# ) +CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in + ${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake @ONLY) +SET_DIRECTORY_PROPERTIES(PROPERTIES + TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake" + ) # Testing IF(BUILD_TESTING) @@ -542,16 +544,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel ENDFOREACH(STP) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Tutorial") - ADD_TEST(testing ${CMAKE_CTEST_COMMAND} # -C \${CTEST_CONFIGURATION_TYPE} + ADD_TEST(testing ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test "${CMake_SOURCE_DIR}/Tests/Testing" "${CMake_BINARY_DIR}/Tests/Testing" --build-generator ${CMAKE_TEST_GENERATOR} --build-project Testing --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - #--test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Testing/bin" - --test-command testing + --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} ) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Testing") |