kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'CTestScheduler'

This commit is contained in:
Brad King 2010-06-07 14:18:30 -04:00
parent bbd528c800 fa3c1817b1
commit 6068651cf7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -453,6 +453,9 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
for(TestMap::iterator i = this->Tests.begin(); for(TestMap::iterator i = this->Tests.begin();
i != this->Tests.end(); ++i) i != this->Tests.end(); ++i)
{ {
//We only want to schedule them by cost in a parallel situation
if(this->ParallelLevel > 1)
{
std::string name = this->Properties[i->first]->Name; std::string name = this->Properties[i->first]->Name;
if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(), if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
name) != this->LastTestsFailed.end()) name) != this->LastTestsFailed.end())
@ -464,6 +467,12 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
this->TestCosts[this->Properties[i->first]->Cost].insert(i->first); this->TestCosts[this->Properties[i->first]->Cost].insert(i->first);
} }
} }
else //we ignore their cost
{
this->TestCosts[this->Tests.size()
- this->Properties[i->first]->Index].insert(i->first);
}
}
} }
//--------------------------------------------------------- //---------------------------------------------------------