From 2b5c9da5bc199dc7a89f5755895f03185eb50838 Mon Sep 17 00:00:00 2001 From: Nils Gladitz Date: Sun, 27 Oct 2013 08:44:55 +0100 Subject: [PATCH] CTest: restore old failed test priority in serial test runs --- Source/CTest/cmCTestMultiProcessHandler.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 2cae179ab..6e9d0e3d3 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -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.