diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2013-12-20 21:44:37 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2013-12-23 14:31:15 (GMT) |
| commit | 7f0d4aff24cbb7ea9336a484f6ad8f73a63ac77f (patch) | |
| tree | 9b14d2960bf92f1de54286f5e85e0a86369c8c5d /Tests/CMakeLists.txt | |
| parent | 6820882be57942403fa7eaf706a0169fd2816fc2 (diff) | |
| download | CMake-7f0d4aff24cbb7ea9336a484f6ad8f73a63ac77f.zip CMake-7f0d4aff24cbb7ea9336a484f6ad8f73a63ac77f.tar.gz CMake-7f0d4aff24cbb7ea9336a484f6ad8f73a63ac77f.tar.bz2 | |
CTest: fix regressions introduced by the ctest-fix-run-serial topic
The first regression resulted in endless looping due to unrun test
dependencies. The second regression prioritized all tests with dependencies
in serial test runs.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5ea604f..063bd2d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2219,6 +2219,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4 --output-on-failure -C "\${CTestTest_CONFIG}") + ADD_TEST_MACRO(CTestTestMissingDependsExe ${CMAKE_CTEST_COMMAND} + --output-on-failure -C "\${CTestTest_CONFIG}") + set_tests_properties(CTestTestMissingDependsExe PROPERTIES + PASS_REGULAR_EXPRESSION "\\*\\*\\*Not Run" + ) + + ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND} + --output-on-failure -C "\${CTestTest_CONFIG}") + if(NOT BORLAND) set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process) add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4 |