Merge topic 'fix-CTestTestSerialOrder-parallel-env'
2f4b13b3
Tests: Protect CTestTestSerialOrder from environment (#15524)
This commit is contained in:
commit
8f95392879
|
@ -2680,6 +2680,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
||||||
|
|
||||||
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
|
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
|
||||||
--output-on-failure -C "\${CTestTest_CONFIG}")
|
--output-on-failure -C "\${CTestTest_CONFIG}")
|
||||||
|
set_property(TEST CTestTestSerialOrder PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
|
||||||
|
|
||||||
if(NOT BORLAND)
|
if(NOT BORLAND)
|
||||||
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
|
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
|
||||||
|
|
Loading…
Reference in New Issue