X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=a70c8be311e69550daffe0182a83cb2590caf975;hb=6d1e6673d7386f4f9139111a6e44d555b8252741;hp=d5b2924a63e96bd83302b82f20b47613454c158d;hpb=9d6c4c89d7abc4ff8da33eead5dcb715c685a2e8;p=p5sagit%2Fp5-mst-13.2.git
diff --git a/t/harness b/t/harness
index d5b2924..a70c8be 100644
--- a/t/harness
+++ b/t/harness
@@ -6,15 +6,18 @@
BEGIN {
chdir 't' if -d 't';
@INC = '../lib'; # pick up only this build's lib
- $ENV{PERL5LIB} = '../lib'; # so children will see it too
}
my $torture; # torture testing?
-use Test::Harness;
+use TAP::Harness 3.13;
+use strict;
-$Test::Harness::switches = ""; # Too much noise otherwise
-$Test::Harness::Verbose++ while @ARGV && $ARGV[0] eq '-v' && shift;
+$::do_nothing = $::do_nothing = 1;
+require './TEST';
+
+my $Verbose = 0;
+$Verbose++ while @ARGV && $ARGV[0] eq '-v' && shift;
if ($ARGV[0] && $ARGV[0] eq '-torture') {
shift;
@@ -26,7 +29,7 @@ if ($ARGV[0] && $ARGV[0] eq '-torture') {
$ENV{PERL_CORE} = 1;
#fudge DATA for now.
-%datahandle = qw(
+my %datahandle = qw(
lib/bigint.t 1
lib/bigintpm.t 1
lib/bigfloat.t 1
@@ -45,13 +48,31 @@ foreach (keys %datahandle) {
unlink "$_.t";
}
-my @tests = ();
+my (@tests, $re);
# [.VMS]TEST.COM calls harness with empty arguments, so clean-up @ARGV
@ARGV = grep $_ && length( $_ ) => @ARGV;
-sub _populate_hash {
- return map {$_, 1} split /\s+/, $_[0];
+sub _extract_tests;
+sub _extract_tests {
+ # This can probably be done more tersely with a map, but I doubt that it
+ # would be as clear
+ my @results;
+ foreach (@_) {
+ my $ref = ref $_;
+ if ($ref) {
+ if ($ref eq 'ARRAY') {
+ push @results, _extract_tests @$_;
+ } elsif ($ref eq 'HASH') {
+ push @results, _extract_tests values %$_;
+ } else {
+ die "Unknown reference type $ref";
+ }
+ } else {
+ push @results, glob $_;
+ }
+ }
+ @results;
}
if ($ARGV[0] && $ARGV[0]=~/^-re/) {
@@ -64,7 +85,24 @@ if ($ARGV[0] && $ARGV[0]=~/^-re/) {
}
}
+my $jobs = $ENV{TEST_JOBS};
+my ($rules, $state, $color);
+if ($ENV{HARNESS_OPTIONS}) {
+ for my $opt ( split /:/, $ENV{HARNESS_OPTIONS} ) {
+ if ( $opt =~ /^j(\d*)$/ ) {
+ $jobs ||= $1 || 9;
+ }
+ elsif ( $opt eq 'c' ) {
+ $color = 1;
+ }
+ else {
+ die "Unknown HARNESS_OPTIONS item: $opt\n";
+ }
+ }
+}
+
if (@ARGV) {
+ # If you want these run in speed order, just use prove
if ($^O eq 'MSWin32') {
@tests = map(glob($_),@ARGV);
}
@@ -72,54 +110,89 @@ if (@ARGV) {
@tests = @ARGV;
}
} else {
+ # Ideally we'd get somewhere close to Tux's Oslo rules
+ # my $rules = {
+ # par => [
+ # { seq => '../ext/DB_File/t/*' },
+ # { seq => '../ext/IO_Compress_Zlib/t/*' },
+ # { seq => '../lib/CPANPLUS/*' },
+ # { seq => '../lib/ExtUtils/t/*' },
+ # '*'
+ # ]
+ # };
+
+ # but for now, run all directories in sequence. In particular, it would be
+ # nice to get the tests in t/op/*.t able to run in parallel.
+
unless (@tests) {
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, ;
- push @tests, if $torture;
- push @tests, if $^O eq 'MSWin32';
+ my @seq = ;
+
+ my @next = qw(comp run cmd io re op uni mro lib porting);
+ push @next, 'japh' if $torture;
+ push @next, 'win32' if $^O eq 'MSWin32';
+ push @next, 'benchmark' if $ENV{PERL_BENCHMARK};
+ # Hopefully TAP::Parser::Scheduler will support this syntax soon.
+ # my $next = { par => '{' . join (',', @next) . '}/*.t' };
+ my $next = { par => [
+ map { "$_/*.t" } @next
+ ] };
+ @tests = _extract_tests ($next);
+
+ # This is a bit of a game, because we only want to sort these tests in
+ # speed order. base/*.t wants to run first, and ext,lib etc last and in
+ # MANIFEST order
+ if ($jobs) {
+ require App::Prove::State;
+ $state = App::Prove::State->new({ store => 'test_state' });
+ $state->apply_switch('slow', 'save');
+ # For some reason get_tests returns *all* the tests previously run,
+ # (in the right order), not simply the selection in @tests
+ # (in the right order). Not sure if this is a bug or a feature.
+ # Whatever, *we* are only interested in the ones that are in @tests
+ my %seen;
+ @seen{@tests} = ();
+ @tests = grep {exists $seen{$_} } $state->get_tests(0, @tests);
+ }
+ @tests = (@seq, @tests);
+ push @seq, $next;
+
+ my @last;
use Config;
- my %skip;
- {
- my %extensions = _populate_hash $Config{'extensions'};
- my %known_extensions = _populate_hash $Config{'known_extensions'};
- foreach (keys %known_extensions) {
- $skip{$_}++ unless $extensions{$_};
+ push @last, sort { lc $a cmp lc $b }
+ _tests_from_manifest($Config{extensions}, $Config{known_extensions});
+ push @last, ;
+ push @last, ;
+
+ my %times;
+ if ($state) {
+ # Where known, collate the elapsed times by test name
+ foreach ($state->results->tests()) {
+ $times{$_->name} = $_->elapsed();
}
}
- use File::Spec;
- my $updir = File::Spec->updir;
- my $mani = File::Spec->catfile(File::Spec->updir, "MANIFEST");
- if (open(MANI, $mani)) {
- my @manitests = ();
- my $ext_pat = $^O eq 'MSWin32' ? '(?:win32/)?ext' : 'ext';
- while () { # similar code in t/TEST
- if (m!^($ext_pat/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
- my ($test, $extension) = ($1, $2);
- if (defined $extension) {
- $extension =~ s!/t$!!;
- # XXX Do I want to warn that I'm skipping these?
- next if $skip{$extension};
- }
- push @manitests, File::Spec->catfile($updir, $test);
- }
- }
- close MANI;
- # Sort the list of test files read from MANIFEST into a sensible
- # order instead of using the order in which they are listed there
- push @tests, sort { lc $a cmp lc $b } @manitests;
- } else {
- warn "$0: cannot open $mani: $!\n";
+
+ my %dir;
+ my %total_time;
+
+ for (@last) {
+ if ($^O eq 'MSWin32') {
+ s,\\,/,g; # canonicalize path
+ };
+ m!(.*[/])! or die "'$_'";
+ push @{$dir{$1}}, $_;
+ $total_time{$1} += $times{$_} || 0;
}
- push @tests, ;
- push @tests, ;
- push @tests, ;
+
+ push @tests, @last;
+
+ # Generate T::H schedule rules that run the contents of each directory
+ # sequentially.
+ 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 };
}
}
if ($^O eq 'MSWin32') {
@@ -127,5 +200,62 @@ if ($^O eq 'MSWin32') {
}
@tests=grep /$re/, @tests
if $re;
-Test::Harness::runtests @tests;
+
+my %options;
+
+my $type = 'perl';
+
+# Load TAP::Parser now as otherwise it could be required in the short time span
+# in which the harness process chdirs into ext/Dist
+require TAP::Parser;
+
+my $h = TAP::Harness->new({
+ rules => $rules,
+ color => $color,
+ jobs => $jobs,
+ verbosity => $Verbose,
+ exec => sub {
+ my ($harness, $test) = @_;
+
+ my $options = $options{$test};
+ if (!defined $options) {
+ $options = $options{$test} = _scan_test($test, $type);
+ }
+
+ return [ split ' ', _cmd($options, $type) ];
+ },
+});
+
+if ($state) {
+ $h->callback(
+ after_test => sub {
+ $state->observe_test(@_);
+ }
+ );
+ $h->callback(
+ after_runtests => sub {
+ $state->commit(@_);
+ }
+ );
+}
+
+$h->callback(
+ parser_args => sub {
+ my ($args, $job) = @_;
+ my $test = $job->[0];
+ _before_fork($options{$test});
+ push @{ $args->{switches} }, "-I../../lib";
+ }
+ );
+
+$h->callback(
+ made_parser => sub {
+ my ($parser, $job) = @_;
+ my $test = $job->[0];
+ my $options = delete $options{$test};
+ _after_fork($options);
+ }
+ );
+
+$h->runtests(@tests);
exit(0);