summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorNils Gladitz <nilsgladitz@gmail.com>2013-10-27 07:44:55 (GMT)
committerNils Gladitz <nilsgladitz@gmail.com>2013-10-27 07:44:55 (GMT)
commit2b5c9da5bc199dc7a89f5755895f03185eb50838 (patch)
tree4b10a8d83f9c3a63dcfda609af4d1a6081f04eaa /Source/CTest
parentb63c71aa35fffeef550ccf7f60382cbe794635ac (diff)
downloadCMake-2b5c9da5bc199dc7a89f5755895f03185eb50838.zip
CMake-2b5c9da5bc199dc7a89f5755895f03185eb50838.tar.gz
CMake-2b5c9da5bc199dc7a89f5755895f03185eb50838.tar.bz2
CTest: restore old failed test priority in serial test runs
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 2cae179..6e9d0e3 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.