diff options
| -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) |