[Cmake-commits] CMake branch, next, updated. v2.8.12-4724-gb42c845

[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  b42c8450da7d01895840ac1bbea0b4bfec83e553 (commit)
       via  2eccdbdc2a7d39a1a56e5ed78abb65ad286b7125 (commit)
      from  1a7eab3042942b2d0e7a46613ef40162082ba36e (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=b42c8450da7d01895840ac1bbea0b4bfec83e553
commit b42c8450da7d01895840ac1bbea0b4bfec83e553
Merge: 1a7eab3 2eccdbd
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Oct 31 17:37:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 31 17:37:22 2013 -0400

    Merge topic 'fix-duplicate-test-run' into next
    
    2eccdbd CTest: prevent tests from being inserted in the cost list twice


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eccdbdc2a7d39a1a56e5ed78abb65ad286b7125
commit 2eccdbdc2a7d39a1a56e5ed78abb65ad286b7125
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Oct 31 22:10:56 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Oct 31 22:10:56 2013 +0100

    CTest: prevent tests from being inserted in the cost list twice

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 6e9d0e3..4c39d10 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -441,6 +441,8 @@ int cmCTestMultiProcessHandler::SearchByName(std::string name)
 //---------------------------------------------------------
 void cmCTestMultiProcessHandler::CreateTestCostList()
 {
+  TestSet alreadySortedTests;
+
   std::list<TestSet> priorityStack;
   priorityStack.push_back(TestSet());
   TestSet &topLevel = priorityStack.back();
@@ -456,6 +458,7 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
       {
       //If the test failed last time, it should be run first.
       this->SortedTests.push_back(i->first);
+      alreadySortedTests.insert(i->first);
       }
     else
       {
@@ -513,7 +516,11 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
     for(TestList::const_iterator j = sortedCopy.begin();
       j != sortedCopy.end(); ++j)
       {
-      this->SortedTests.push_back(*j);
+      if(alreadySortedTests.find(*j) == alreadySortedTests.end())
+        {
+        this->SortedTests.push_back(*j);
+        alreadySortedTests.insert(*j);
+        }
       }
     }
 }

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

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake