Cost-based test scheduling should only be done in parallel mode.
This commit is contained in:
parent
6138ff02ed
commit
fa3c1817b1
|
@ -453,15 +453,24 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
|
|||
for(TestMap::iterator i = this->Tests.begin();
|
||||
i != this->Tests.end(); ++i)
|
||||
{
|
||||
std::string name = this->Properties[i->first]->Name;
|
||||
if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
|
||||
name) != this->LastTestsFailed.end())
|
||||
//We only want to schedule them by cost in a parallel situation
|
||||
if(this->ParallelLevel > 1)
|
||||
{
|
||||
this->TestCosts[FLT_MAX].insert(i->first);
|
||||
std::string name = this->Properties[i->first]->Name;
|
||||
if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
|
||||
name) != this->LastTestsFailed.end())
|
||||
{
|
||||
this->TestCosts[FLT_MAX].insert(i->first);
|
||||
}
|
||||
else
|
||||
{
|
||||
this->TestCosts[this->Properties[i->first]->Cost].insert(i->first);
|
||||
}
|
||||
}
|
||||
else
|
||||
else //we ignore their cost
|
||||
{
|
||||
this->TestCosts[this->Properties[i->first]->Cost].insert(i->first);
|
||||
this->TestCosts[this->Tests.size()
|
||||
- this->Properties[i->first]->Index].insert(i->first);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue