test/run_tests.pl: In parallel runs, start those tests first that run longest
Also untabify the Perl source file.
@@ -70,6 +70,16 @@ open $openssl_args{'tap_copy'}, ">$outfilename"
my @alltests = find_matching_tests("*");
my %tests = ();
+sub reorder {
+ my $key = pop;
+
+ # for parallel test runs, do slow tests first
+ if (defined $jobs && $jobs > 1 && $key =~ m/test_ssl_new|test_fuzz/) {
+ $key =~ s/(\d+)-/00-/;
+ }
+ return $key;
+}
+
my $initial_arg = 1;
foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
if ($arg eq 'list') {
@@ -82,7 +92,7 @@ foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
if ($arg eq 'alltests') {
warn "'alltests' encountered, ignoring everything before that...\n"
unless $initial_arg;
- %tests = map { $_ => basename($_) } @alltests;
+ %tests = map { $_ => 1 } @alltests;
} elsif ($arg =~ m/^(-?)(.*)/) {
my $sign = $1;
my $test = $2;
@@ -90,7 +100,7 @@ foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
# If '-foo' is the first arg, it's short for 'alltests -foo'
if ($sign eq '-' && $initial_arg) {
- %tests = map { $_ => basename($_) } @alltests;
+ %tests = map { $_ => 1 } @alltests;
}
if (scalar @matches == 0) {
@@ -102,7 +112,7 @@ foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
if ($sign eq '-') {
delete $tests{$test};
} else {
- $tests{$test} = basename($test);
+ $tests{$test} = 1;
}
}
}
@@ -280,8 +290,8 @@ unless (defined $eres) {
my $harness = $package->new(\%tapargs);
my $ret =
- $harness->runtests(map { [ abs2rel($_, rel2abs(curdir())), $tests{$_} ] }
- sort keys %tests);
+ $harness->runtests(map { [ abs2rel($_, rel2abs(curdir())), basename($_) ] }
+ sort { reorder($a) cmp reorder($b) } keys %tests);
# $ret->has_errors may be any number, not just 0 or 1. On VMS, numbers
# from 2 and on are used as is as VMS statuses, which has severity encoded
