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

CTest: consider previously failed tests before all others

Browse Source
This commit is contained in:
Nils Gladitz 2013-10-19 08:52:28 +02:00
parent e809d8cfdf
commit 6d4d7ca955
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@ -448,7 +448,16 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
for(TestMap::const_iterator i = this->Tests.begin(); for(TestMap::const_iterator i = this->Tests.begin();
i != this->Tests.end(); ++i) i != this->Tests.end(); ++i)
{ {
topLevel.insert(i->first); if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
this->Properties[i->first]->Name) != this->LastTestsFailed.end())
{
//If the test failed last time, it should be run first.
this->SortedTests.push_back(i->first);
}
else
{
topLevel.insert(i->first);
}
} }
while(priorityStack.back().size()) while(priorityStack.back().size())
@ -473,20 +482,6 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
priorityStack.pop_back(); priorityStack.pop_back();
for(TestMap::iterator i = this->Tests.begin();
i != this->Tests.end(); ++i)
{
//If the test failed last time, it should be run first, so max the cost.
//Only do this for parallel runs; in non-parallel runs, avoid clobbering
//the test's explicitly set cost.
if(this->ParallelLevel > 1 &&
std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
this->Properties[i->first]->Name) != this->LastTestsFailed.end())
{
this->Properties[i->first]->Cost = FLT_MAX;
}
}
for(std::list<TestSet>::reverse_iterator i = priorityStack.rbegin(); for(std::list<TestSet>::reverse_iterator i = priorityStack.rbegin();
i != priorityStack.rend(); ++i) i != priorityStack.rend(); ++i)
{ {