diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index a45b3db..3759af1 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -460,14 +460,7 @@ bool cmCTestMultiProcessHandler::StartTest(int test) return false; } - // if there are no depends left then run this test - if (this->PendingTests[test].Depends.empty()) { - return this->StartTestProcess(test); - } - // This test was not able to start because it is waiting - // on depends to run - this->DeallocateResources(test); - return false; + return this->StartTestProcess(test); } void cmCTestMultiProcessHandler::StartNextTests() @@ -553,6 +546,11 @@ void cmCTestMultiProcessHandler::StartNextTests() continue; } + // Exclude tests that depend on unfinished tests. + if (!this->PendingTests[test].Depends.empty()) { + continue; + } + size_t processors = this->GetProcessorsUsed(test); if (this->TestLoad > 0) { // Exclude tests that are too big to fit in the spare load. |