From c19adb17ef58246c34136e5612b57d0f8dcdbe00 Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Thu, 2 Oct 2014 20:24:07 +0200 Subject: [PATCH] dg-extract-results.py (output_variation): Always sort if do_sum. 2014-10-02 Segher Boessenkool * dg-extract-results.py (output_variation): Always sort if do_sum. From-SVN: r215817 --- contrib/ChangeLog | 4 ++++ contrib/dg-extract-results.py | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index f7cb37e9aab..7fa1b318872 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2014-10-02 Segher Boessenkool + + * dg-extract-results.py (output_variation): Always sort if do_sum. + 2014-09-22 Tom de Vries * mklog: Add --inline option. diff --git a/contrib/dg-extract-results.py b/contrib/dg-extract-results.py index fafd38e76f9..7db5e64cfe3 100644 --- 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: -- 2.30.2