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

contrib/ChangeLog

+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.

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: