diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-28 12:39:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-28 12:39:11 (GMT) |
| commit | ecc6d7f9190a660c0f442c4d03854b06e3fc7856 (patch) | |
| tree | 2a3ee9b7782f0949d596ce721fb6c6d052d71510 | |
| parent | 387b93d09d99caf10039dded8a739942e5fea15c (diff) | |
| parent | 2b5c9da5bc199dc7a89f5755895f03185eb50838 (diff) | |
| download | CMake-ecc6d7f9190a660c0f442c4d03854b06e3fc7856.zip CMake-ecc6d7f9190a660c0f442c4d03854b06e3fc7856.tar.gz CMake-ecc6d7f9190a660c0f442c4d03854b06e3fc7856.tar.bz2 | |
Merge topic 'restore-serial-failed-test-order'
2b5c9da CTest: restore old failed test priority in serial test runs
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 7 |
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. |