Merge topic 'borland-no-CTestLimitDashJ'
cd345aa
Skip CTestLimitDashJ test on Borland
This commit is contained in:
commit
ec5c9af2bc
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue