diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-08 17:55:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-08 17:55:10 (GMT) |
| commit | ec5c9af2bcf742fc15a2af5e73cacfdb0ad406e4 (patch) | |
| tree | f170e06c1802030957481cf8b85d1e160c5df836 | |
| parent | 4408382f198fdc61a010b707c063efd021b0e10a (diff) | |
| parent | cd345aa77ded14ab729b11e1ce3ecb709d59b6eb (diff) | |
| download | CMake-ec5c9af2bcf742fc15a2af5e73cacfdb0ad406e4.zip CMake-ec5c9af2bcf742fc15a2af5e73cacfdb0ad406e4.tar.gz CMake-ec5c9af2bcf742fc15a2af5e73cacfdb0ad406e4.tar.bz2 | |
Merge topic 'borland-no-CTestLimitDashJ'
cd345aa Skip CTestLimitDashJ test on Borland
| -rw-r--r-- | Tests/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index dc8d869..9c3ed59 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2056,9 +2056,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log" ) - set(CTestLimitDashJ_EXTRA_OPTIONS --force-new-ctest-process) - add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4 - --output-on-failure -C "\${CTestTest_CONFIG}") + if(NOT BORLAND) + set(CTestLimitDashJ_EXTRA_OPTIONS --force-new-ctest-process) + add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4 + --output-on-failure -C "\${CTestTest_CONFIG}") + endif() add_test(CTestTestPrintLabels ${CMAKE_CTEST_COMMAND} --print-labels) set_tests_properties(CTestTestPrintLabels PROPERTIES LABELS "Label1;Label2") |