diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-02-02 15:14:50 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-02-02 15:14:50 (GMT) |
| commit | c160587130d81450f72c0e0abf4b4efd0d565b74 (patch) | |
| tree | b374cf72c7f1ccb83e523774c349996661a58f89 /Source | |
| parent | f8b898fa6de495f7164996ec5a5c8e6049b1a28c (diff) | |
| download | CMake-c160587130d81450f72c0e0abf4b4efd0d565b74.zip CMake-c160587130d81450f72c0e0abf4b4efd0d565b74.tar.gz CMake-c160587130d81450f72c0e0abf4b4efd0d565b74.tar.bz2 | |
ENH: allow the dashboard to override the timeouts for CTestTest
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 70c0dd1..9595fbd 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1079,14 +1079,26 @@ IF(BUILD_TESTING) -S "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" -V --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log" ) - # these tests take a log time, make sure they have it + # these tests take a long time, make sure they have it IF(COMMAND SET_TESTS_PROPERTIES) - SET_TESTS_PROPERTIES ( CTestTest CTestTest2 CTestTest3 - PROPERTIES TIMEOUT 1500 - ) + # if timeouts have not already been set + GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT) + IF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND) + SET_TESTS_PROPERTIES ( CTestTest PROPERTIES TIMEOUT 1500) + ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND) + + GET_TEST_PROPERTY(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT) + IF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND) + SET_TESTS_PROPERTIES ( CTestTest2 PROPERTIES TIMEOUT 1500) + ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND) + + GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT) + IF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND) + SET_TESTS_PROPERTIES ( CTestTest3 PROPERTIES TIMEOUT 1500) + ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND) ENDIF(COMMAND SET_TESTS_PROPERTIES) ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS) - + IF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode) SET(CMAKE_SKIP_BOOTSTRAP_TEST 1) ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode) |