chdir 't' if -d 't';
@INC = '../lib'; # pick up only this build's lib
}
-delete $ENV{PERL5LIB};
my $torture; # torture testing?
use TAP::Harness 3.13;
use strict;
+use Config;
+
+$::do_nothing = $::do_nothing = 1;
+require './TEST';
my $Verbose = 0;
$Verbose++ while @ARGV && $ARGV[0] eq '-v' && shift;
# [.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
}
}
-sub _tests_from_manifest {
- my ($extensions, $known_extensions) = @_;
- my %skip;
- my %extensions = _populate_hash($extensions);
- my %known_extensions = _populate_hash($known_extensions);
-
- foreach (keys %known_extensions) {
- $skip{$_}++ unless $extensions{$_};
- }
-
- my @results;
- my $mani = '../MANIFEST';
- if (open(MANI, $mani)) {
- while (<MANI>) { # similar code in t/TEST
- if (m!^(ext/(\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};
- my $flat_extension = $extension;
- $flat_extension =~ s!-!/!g;
- next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
- }
- push @results, "../$test";
- }
- }
- close MANI;
- } else {
- warn "$0: cannot open $mani: $!\n";
- }
- return @results;
-}
-
if (@ARGV) {
# If you want these run in speed order, just use prove
if ($^O eq 'MSWin32') {
else {
@tests = @ARGV;
}
+ # This is a hack to force config_heavy.pl to be loaded, before the
+ # prep work for running a test changes directory.
+ 1 if $Config{d_fork};
} else {
# Ideally we'd get somewhere close to Tux's Oslo rules
# my $rules = {
unless (@tests) {
my @seq = <base/*.t>;
- my @next = qw(comp run cmd io op uni mro lib porting);
+ 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};
push @seq, $next;
my @last;
- use Config;
push @last, sort { lc $a cmp lc $b }
_tests_from_manifest($Config{extensions}, $Config{known_extensions});
- push @last, <pod/*.t>;
push @last, <x2p/*.t>;
my %times;
if ($^O eq 'MSWin32') {
s,\\,/,g; # canonicalize path
};
- m!(.*[/])! or die "'$_'";
+ # Treat every file matching lib/*.t as a "directory"
+ m!\A(\.\./lib/[^/]+\.t\z|.*[/])! or die "'$_'";
push @{$dir{$1}}, $_;
$total_time{$1} += $times{$_} || 0;
}
# Generate T::H schedule rules that run the contents of each directory
# sequentially.
- push @seq, { par => [ map { { seq => "$_*" } } sort {
+ push @seq, { par => [ map { s!/$!/*!; { seq => $_ } } sort {
# Directories, ordered by total time descending then name ascending
$total_time{$b} <=> $total_time{$a} || $a cmp $b
} keys %dir ] };
@tests=grep /$re/, @tests
if $re;
+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(
parser_args => sub {
- my ( $args, $test ) = @_;
- push @{ $args->{switches} }, '-I../lib';
+ 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);
+
+my $agg = $h->runtests(@tests);
+exit $agg->has_errors ? 1 : 0;