diff options
| author | Brad King <brad.king@kitware.com> | 2009-12-01 14:12:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-12-01 14:12:07 (GMT) |
| commit | 7380d3ab7c6a378040da8aa86d770694bbf114d0 (patch) | |
| tree | c4ca4eb66acd3b4da51f3d10b2e7051853920f4d | |
| parent | 1a5f209e625b18c2f23b90f5e123447909a23e1a (diff) | |
| download | CMake-7380d3ab7c6a378040da8aa86d770694bbf114d0.zip CMake-7380d3ab7c6a378040da8aa86d770694bbf114d0.tar.gz CMake-7380d3ab7c6a378040da8aa86d770694bbf114d0.tar.bz2 | |
Always use a configuration for CTestTestTimeout
This test requires that the dashboard script it drives be invoked with
"ctest -C <config> -S ...". We create a "CTestTest_CONFIG" variable to
hold a configuration selected at test time. We use the configuration
given to the outer CTest, if any, and then default to either Debug or
the CMAKE_BUILD_TYPE.
| -rw-r--r-- | Tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/EnforceConfig.cmake.in | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7d2d28d..a9b584b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -22,6 +22,12 @@ IF(DEFINED ENV{HOME} AND NOT CTEST_NO_TEST_HOME) SET(ENV{HOME} \"${TEST_HOME}\")") ENDIF() +# Choose a default configuration for CTest tests. +SET(CTestTest_CONFIG Debug) +IF(NOT CMAKE_CONFIGURATION_TYPES AND CMAKE_BUILD_TYPE) + SET(CTestTest_CONFIG ${CMAKE_BUILD_TYPE}) +ENDIF() + # Make sure the 'testing' test gets a proper configuration. CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in ${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake @ONLY) @@ -1231,7 +1237,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel "${CMake_BINARY_DIR}/Tests/CTestTestTimeout/test.cmake" @ONLY ESCAPE_QUOTES) ADD_TEST(CTestTestTimeout ${CMAKE_CTEST_COMMAND} - -C "\${CTEST_CONFIGURATION_TYPE}" + -C "\${CTestTest_CONFIG}" -S "${CMake_BINARY_DIR}/Tests/CTestTestTimeout/test.cmake" -V --output-log "${CMake_BINARY_DIR}/Tests/CTestTestTimeout/testOutput.log" ) diff --git a/Tests/EnforceConfig.cmake.in b/Tests/EnforceConfig.cmake.in index b2101f8..0340db0 100644 --- a/Tests/EnforceConfig.cmake.in +++ b/Tests/EnforceConfig.cmake.in @@ -1,3 +1,10 @@ +# Choose a configuration with which to drive CTest tests. +IF(CTEST_CONFIGURATION_TYPE) + SET(CTestTest_CONFIG "${CTEST_CONFIGURATION_TYPE}") +ELSE(CTEST_CONFIGURATION_TYPE) + SET(CTestTest_CONFIG "@CTestTest_CONFIG@") +ENDIF(CTEST_CONFIGURATION_TYPE) + # Older versions of CMake do not support an empty configuration name in # CTEST_CONFIGURATION_TYPE for the 'testing' test. SET(CONFIG_REQUIRED) |