diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-24 14:40:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-24 14:40:19 (GMT) |
| commit | 5890f562e3ded6f7e42e0a974aa0c9193d011cca (patch) | |
| tree | ab2dbedf443d4c884b9b7fe68798a7cc444c9539 /Source | |
| parent | 83f8697d0e1bb003d930236baf7b8708b2c8ba4a (diff) | |
| parent | 1a4c0c55c765bf074943702722baa39decb82c3a (diff) | |
| download | CMake-5890f562e3ded6f7e42e0a974aa0c9193d011cca.zip CMake-5890f562e3ded6f7e42e0a974aa0c9193d011cca.tar.gz CMake-5890f562e3ded6f7e42e0a974aa0c9193d011cca.tar.bz2 | |
Merge branch 'fix-ctest-parallel'
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 9b8cef5..1eb84e8 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -92,6 +92,7 @@ void cmCTestMultiProcessHandler::StartTestProcess(int test) this->TestRunningMap[test] = true; // mark the test as running // now remove the test itself this->EraseTest(test); + this->RunningCount += GetProcessorsUsed(test); cmCTestRunTest* testRun = new cmCTestRunTest(this->TestHandler); testRun->SetIndex(test); @@ -267,7 +268,6 @@ void cmCTestMultiProcessHandler::StartNextTests() return; } numToStart -= processors; - this->RunningCount += processors; } else { |