Merge topic 'restore-serial-failed-test-order'

2b5c9da CTest: restore old failed test priority in serial test runs
This commit is contained in:
Brad King 2013-10-28 08:39:11 -04:00 committed by CMake Topic Stage
commit ecc6d7f919
1 changed files with 4 additions and 3 deletions

View File

@ -445,12 +445,13 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
priorityStack.push_back(TestSet());
TestSet &topLevel = priorityStack.back();
// Add previously failed tests to the front of the cost list
// and queue other tests for further sorting
// In parallel test runs add previously failed tests to the front
// of the cost list and queue other tests for further sorting
for(TestMap::const_iterator i = this->Tests.begin();
i != this->Tests.end(); ++i)
{
if(std::find(this->LastTestsFailed.begin(), this->LastTestsFailed.end(),
if(this->ParallelLevel > 1 &&
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.