From 226de479579f4a84dd17654b44e5aef323b0a403 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Sun, 9 Aug 2009 10:44:28 +0100 Subject: Run the main tests "slowest first" by ordering the rules correctly. (It seems that the current TAP::Harness implementation sequences based on the parallel/serial rules, not the order of the list of test names presented to it.) --- t/harness | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 't/harness') diff --git a/t/harness b/t/harness index c2fbbeed9a..9e3af04fae 100644 --- a/t/harness +++ b/t/harness @@ -200,19 +200,31 @@ if (@ARGV) { push @last, ; push @last, ; + my %times; + if ($state) { + # Where known, collate the elapsed times by test name + foreach ($state->results->tests()) { + $times{$_->name} = $_->elapsed(); + } + } + + my %dir; + my %total_time; + + for (@last) { + m!(.*/)! or die "'$_'"; + push @{$dir{$1}}, $_; + $total_time{$1} += $times{$_} || 0; + } + push @tests, @last; # Generate T::H schedule rules that run the contents of each directory # sequentially. - { - my %dir; - for (@last) { - s{[^/]+$}{\*}; - $dir{$_}++; - } - - push @seq, { par => [ map { { seq => $_ } } sort keys %dir ] }; - } + push @seq, { par => [ map { { seq => "$_*" } } sort { + # Directories, ordered by total time descending then name ascending + $total_time{$b} <=> $total_time{$a} || $a cmp $b + } keys %dir ] }; $rules = { seq => \@seq }; } -- cgit v1.2.1