dg-extract-results.py (output_variation): Always sort if do_sum.

2014-10-02  Segher Boessenkool  <segher@kernel.crashing.org>

	* dg-extract-results.py (output_variation): Always sort if do_sum.

From-SVN: r215817

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f7cb37e9aab785a8cf86ea902d3603d854bb610a..7fa1b3188724021b2c877ec80e7bb9983e499d4a 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-02  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       * dg-extract-results.py (output_variation): Always sort if do_sum.
+
 2014-09-22  Tom de Vries  <tom@codesourcery.com>
 
        * mklog: Add --inline option.

diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py
index fafd38e76f9e112e915ac53e3be715c59c139e4a..7db5e64cfe3fbfba5b0bd1084d145b77b14110d2 100644 (file)
--- a/contrib/dg-extract-results.py
+++ b/contrib/dg-extract-results.py
@@ -495,15 +495,7 @@ class Prog:
                                key = attrgetter ('name')):
             sys.stdout.write ('Running ' + harness.name + ' ...\n')
             if self.do_sum:
-                # Keep the original test result order if there was only
-                # one segment for this harness.  This is needed for
-                # unsorted.exp, which has unusual test names.  Otherwise
-                # sort the tests by test filename.  If there are several
-                # subtests for the same test filename (such as 'compilation',
-                # 'test for excess errors', etc.) then keep the subtests
-                # in the original order.
-                if len (harness.segments) > 1:
-                    harness.results.sort()
+                harness.results.sort()
                 for (key, line) in harness.results:
                     sys.stdout.write (line)
             else: