summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-01-11 20:24:50 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-01-11 20:24:50 (GMT)
commit42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3 (patch)
treeb819f1811f5635a2c62f2736931706ad4addc7b4 /Tests
parentcaa45a5f817f3608c8f2b30b039925f4bafc0ea1 (diff)
downloadCMake-42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3.zip
CMake-42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3.tar.gz
CMake-42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3.tar.bz2
ExternalProject Test: Increase test timeout value
Previously, it was hard-coded at 1000 seconds. Now it uses the value of CMAKE_LONG_TEST_TIMEOUT, which has a minimum value of 1500 seconds, but might have a longer value depending on the CTEST_TEST_TIMEOUT value of the driving dashboard. This should help avoid test failures on overloaded dashboard machines where it really does take that long to finish the test successfully.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index faaa177..d872fa7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -792,11 +792,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--test-command ${CMAKE_CTEST_COMMAND} -V
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject")
- # The ExternalProject test takes 900 seconds on some machines!
- GET_TEST_PROPERTY(ExternalProject TIMEOUT PREVIOUS_TIMEOUT)
- IF("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
- SET_TESTS_PROPERTIES(ExternalProject PROPERTIES TIMEOUT 1000)
- ENDIF("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
+ SET_TESTS_PROPERTIES(ExternalProject PROPERTIES
+ TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
# do each of the tutorial steps
FOREACH(STP RANGE 1 7)