[Cmake-commits] CMake branch, next, updated. v2.8.12-4551-gb9b7507

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b9b7507c0acf4450cbfe5fb196d0670d02556fce (commit)
       via  2b5c9da5bc199dc7a89f5755895f03185eb50838 (commit)
       via  b63c71aa35fffeef550ccf7f60382cbe794635ac (commit)
      from  ced8281000bf7c101ec23860c232703d284a6eaf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9b7507c0acf4450cbfe5fb196d0670d02556fce
commit b9b7507c0acf4450cbfe5fb196d0670d02556fce
Merge: ced8281 2b5c9da
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Oct 27 13:44:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 27 13:44:05 2013 -0400

    Merge topic 'restore-serial-failed-test-order' into next
    
    2b5c9da CTest: restore old failed test priority in serial test runs
    b63c71a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b5c9da5bc199dc7a89f5755895f03185eb50838
commit 2b5c9da5bc199dc7a89f5755895f03185eb50838
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Oct 27 08:44:55 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sun Oct 27 08:44:55 2013 +0100

    CTest: restore old failed test priority in serial test runs

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.

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                   |    2 +-
 Source/CTest/cmCTestMultiProcessHandler.cxx |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake