On Tue, Sep 23, 2014 at 04:33:19PM +0100, Richard Sandiford wrote:
> FWIW, the \S+ thing was deliberate. When one test is run multiple times
> with different options, those options aren't necessarily tried in
> alphabetical order. The old sh/awk script therefore used just the test
> name as the key and kept tests with the same name in the order that
> they were encountered:
>
> /^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/
> {
> testname=\$2
> # Ugly hack for gfortran.dg/dg.exp
> if ("$TOOL" == "gfortran" && testname ~ /^gfortran.dg\/g77\//)
> testname="h"testname
> }
>
> (note the "$2"). This means that the output of the script is in the same
> order as it would be for non-parallel runs. I was following (or trying
> to follow) that behaviour in the python script.
My understanding was that the sh version sorts the testcase name followed
by the full line and then removes whatever has been there before the
PASS/XPASS etc., so while e.g. whether some test PASSed or FAILed etc.
is then more important than the option, if two tests PASS, the options are
still used for the sorting. Note that before the parallelization changes,
usually the same test filename would be run all by a single runtest
instance, so it really didn't matter that much.
> Your patch instead sorts based on the full test name, including options,
> which means that the output no longer matches what you'd get from a
> non-parallel run. AFAICT, it also no longer matches what you'd get from
> the .sh version. That might be OK, just thought I'd mention it.
I'm afraid there is not enough info to reconstruct the order serial version
has.
Jakub
