[Cmake-commits] CMake branch, next, updated. v2.8.4-931-g268b337

David Cole david.cole at kitware.com
Fri Feb 18 13:30:06 EST 2011


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  268b33797d27b0255587d972d5bebef048c167b7 (commit)
       via  8af8eab7a43aa80ba89d082e23928e19265be885 (commit)
      from  633f6285702d4c044735f119f1b7ef645f808eb6 (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=268b33797d27b0255587d972d5bebef048c167b7
commit 268b33797d27b0255587d972d5bebef048c167b7
Merge: 633f628 8af8eab
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Feb 18 13:30:02 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 18 13:30:02 2011 -0500

    Merge topic 'fix-11877-sort-tests-correctly' into next
    
    8af8eab Use stable_sort to preserve test order (#11877)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8af8eab7a43aa80ba89d082e23928e19265be885
commit 8af8eab7a43aa80ba89d082e23928e19265be885
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Feb 18 13:10:26 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Feb 18 13:10:26 2011 -0500

    Use stable_sort to preserve test order (#11877)
    
    Using sort results in a possibly-modified sorting
    when all elements are "tied" - use stable_sort instead
    to preserve the original ordering of tied elements.

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index f3a4457..2cae802 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -484,7 +484,7 @@ void cmCTestMultiProcessHandler::CreateTestCostList()
     }
 
   TestComparator comp(this);
-  std::sort(SortedTests.begin(), SortedTests.end(), comp);
+  std::stable_sort(SortedTests.begin(), SortedTests.end(), comp);
 }
 
 //---------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list