summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-22 15:16:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-22 15:16:40 (GMT)
commit8f9539287903e514567cf3dfac9636445b3fafa1 (patch)
treef1395625f9b3ee8c2ddc56a0fc24b3e935b24ec2 /Tests
parent5e98ba0cd8baf892a04a00ad16418582791d88c8 (diff)
parent2f4b13b32d100b755ff6b4a61cdd0d85a99e6ebb (diff)
downloadCMake-8f9539287903e514567cf3dfac9636445b3fafa1.zip
CMake-8f9539287903e514567cf3dfac9636445b3fafa1.tar.gz
CMake-8f9539287903e514567cf3dfac9636445b3fafa1.tar.bz2
Merge topic 'fix-CTestTestSerialOrder-parallel-env'
2f4b13b3 Tests: Protect CTestTestSerialOrder from environment (#15524)
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 699b616..d568a64 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2680,6 +2680,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
--output-on-failure -C "\${CTestTest_CONFIG}")
+ set_property(TEST CTestTestSerialOrder PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
if(NOT BORLAND)
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)