diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-07 18:33:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-07 18:33:57 (GMT) |
| commit | 69292eacfa0b8e61e3ae446984eef5a387bdc9d6 (patch) | |
| tree | 3691c24468f164d21bb00422793b58d6b0effecf /Tests | |
| parent | 6f96e32bfd2dcd6fd94e65083da90be99b4f0316 (diff) | |
| parent | f6909a69ece83851dd9c08a17e08b6c4fb34f308 (diff) | |
| download | CMake-69292eacfa0b8e61e3ae446984eef5a387bdc9d6.zip CMake-69292eacfa0b8e61e3ae446984eef5a387bdc9d6.tar.gz CMake-69292eacfa0b8e61e3ae446984eef5a387bdc9d6.tar.bz2 | |
Merge branch 'fix-large-output-test'
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/CTestSubmitLargeOutput/test.cmake.in | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 25f7ade..b99b183 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1493,6 +1493,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ # SET_TESTS_PROPERTIES(CTestSubmitLargeOutput PROPERTIES PASS_REGULAR_EXPRESSION "Errors occurred during submission") + + # Give this test plenty of time to run on slower machines: + # + SET_TESTS_PROPERTIES(CTestSubmitLargeOutput PROPERTIES + TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) ENDIF(CTEST_RUN_CTestSubmitLargeOutput) IF (CMAKE_RUN_LONG_TESTS AND TEST_KDE4_STABLE_BRANCH) diff --git a/Tests/CTestSubmitLargeOutput/test.cmake.in b/Tests/CTestSubmitLargeOutput/test.cmake.in index bc094b0..17a7c7d 100644 --- a/Tests/CTestSubmitLargeOutput/test.cmake.in +++ b/Tests/CTestSubmitLargeOutput/test.cmake.in @@ -16,6 +16,7 @@ CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1000000000) SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000000) +SET(CTEST_TEST_TIMEOUT @CMAKE_LONG_TEST_TIMEOUT@) CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) |