Add backport_test_order_fix.diff to restore conpatibility with earlier versions with respect to the test run order. (Closes: #615054)ci/unstable
parent
d9ef5a1629
commit
7b26c06e09
@ -0,0 +1,29 @@
|
||||
From: David Cole <david.cole@kitware.com>
|
||||
Date: Fri, 18 Feb 2011 18:10:26 +0000 (-0500)
|
||||
Subject: Use stable_sort to preserve test order (#11877)
|
||||
Origin: backport, http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=8af8eab7a43aa80ba89d082e23928e19265be885
|
||||
Acked-By: Modestas Vainius <modax@debian.org>
|
||||
Last-Update: 2011-02-18
|
||||
Bug: http://public.kitware.com/Bug/view.php?id=11877
|
||||
Bug-Debian: http://bugs.debian.org/615054
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
@ -1,2 +1,3 @@
|
||||
fixup_manpages.diff
|
||||
FindBoost_add_-lpthread_#563479.diff
|
||||
backport_test_order_fix.diff
|
||||
|
Loading…
Reference in new issue