On Thu, Oct 02, 2014 at 11:47:39AM -0500, Segher Boessenkool wrote:
> On Wed, Sep 24, 2014 at 10:54:57AM -0400, Andrew MacLeod wrote:
> > Is this suppose to be resolved now? I'm still seeing some issues with a
> > branch cut from mainline from yesterday.
>
> Confirmed. The following patch works for me, and Andrew has tested it
> as well. The comment it removes isn't valid before the patch either.
>
> Okay for mainline?
>
>
> Segher
>
>
> 2014-10-02 Segher Boessenkool <[email protected]>
>
> contrib/
> * dg-extract-results.py (output_variation): Always sort if do_sum.
Ok, thanks.
> --- 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:
Jakub