mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 12:11:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCTestMultiProcessHandler: Consolidate test readiness checks

Browse Source
This commit is contained in:
Brad King
2023-10-20 18:16:01 -04:00
parent ad3df3ce4d
commit 5ff0b4ed57
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@@ -449,17 +449,6 @@ std::string cmCTestMultiProcessHandler::GetName(int test)
bool cmCTestMultiProcessHandler::StartTest(int test)
{
// Check for locked project resources.
for (std::string const& i : this->Properties[test]->ProjectResources) {
if (cm::contains(this->ProjectResourcesLocked, i)) {
return false;
}
}
if (!this->AllocateResources(test)) {
return false;
}
return this->StartTestProcess(test);
}
@@ -576,6 +565,19 @@ void cmCTestMultiProcessHandler::StartNextTests()
continue;
}
// Exclude tests that depend on currently-locked project resources.
for (std::string const& i : this->Properties[test]->ProjectResources) {
if (cm::contains(this->ProjectResourcesLocked, i)) {
continue;
}
}
// Allocate system resources needed by this test.
if (!this->AllocateResources(test)) {
continue;
}
// The test is ready to run.
if (this->StartTest(test)) {
numToStart -= processors;
}