diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-08 13:53:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-08 13:53:17 (GMT) |
| commit | 5bf71025056465ebacf49b9da6446b8ed7833a95 (patch) | |
| tree | 7fc3ece24f2d1d27798abe2a99d479f28a8abd52 /Tests | |
| parent | 5a364d8ed54bbfb1d3d6378503b2772256ac2a17 (diff) | |
| parent | eb2decc02d28f41a3e189d5387be24552c42060f (diff) | |
| download | CMake-5bf71025056465ebacf49b9da6446b8ed7833a95.zip CMake-5bf71025056465ebacf49b9da6446b8ed7833a95.tar.gz CMake-5bf71025056465ebacf49b9da6446b8ed7833a95.tar.bz2 | |
Merge topic 'ctest_rerun_failed'
eb2decc ctest: Add --rerun-failed option
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7b0727a..2d35b5a 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2140,6 +2140,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ set_tests_properties(CTestTestTimeout PROPERTIES PASS_REGULAR_EXPRESSION "TestTimeout *\\.+ *\\*\\*\\*Timeout.*CheckChild *\\.+ *Passed") + # this test only runs correctly if WORKING_DIRECTORY is honored. + if (NOT CMAKE_VERSION VERSION_LESS "2.8.4") + add_test( + NAME CTestTestRerunFailed + COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed) + set_tests_properties(CTestTestRerunFailed PROPERTIES + PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout + WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout) + endif () + configure_file( "${CMake_SOURCE_DIR}/Tests/CTestTestZeroTimeout/test.cmake.in" "${CMake_BINARY_DIR}/Tests/CTestTestZeroTimeout/test.cmake" |