summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-24 14:40:19 (GMT)
committerBrad King <brad.king@kitware.com>2010-06-24 14:40:19 (GMT)
commit5890f562e3ded6f7e42e0a974aa0c9193d011cca (patch)
treeab2dbedf443d4c884b9b7fe68798a7cc444c9539 /Tests
parent83f8697d0e1bb003d930236baf7b8708b2c8ba4a (diff)
parent1a4c0c55c765bf074943702722baa39decb82c3a (diff)
downloadCMake-5890f562e3ded6f7e42e0a974aa0c9193d011cca.zip
CMake-5890f562e3ded6f7e42e0a974aa0c9193d011cca.tar.gz
CMake-5890f562e3ded6f7e42e0a974aa0c9193d011cca.tar.bz2
Merge branch 'fix-ctest-parallel'
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CTestTestParallel/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/CTestTestParallel/CMakeLists.txt b/Tests/CTestTestParallel/CMakeLists.txt
index 8fab44b..fc53f68 100644
--- a/Tests/CTestTestParallel/CMakeLists.txt
+++ b/Tests/CTestTestParallel/CMakeLists.txt
@@ -11,3 +11,5 @@ SET_TESTS_PROPERTIES(TestRunSerial1 TestRunSerial2 PROPERTIES RUN_SERIAL true)
ADD_TEST (TestProcessorsGreaterThanMPL1 LockFile)
ADD_TEST (TestProcessorsGreaterThanMPL2 LockFile)
SET_TESTS_PROPERTIES(TestProcessorsGreaterThanMPL1 PROPERTIES PROCESSORS 10)
+SET_TESTS_PROPERTIES(TestProcessorsGreaterThanMPL1 PROPERTIES DEPENDS
+ TestProcessorsGreaterThanMPL2)