X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fharness;h=88a7bfad78a799e48d2764a0b9bacc05477a6d8b;hb=3fd969f44926f311e1c67d9470a9e936f7af2d73;hp=17a6ffba5587a90535f2d9be37ae3ff6aaab1188;hpb=154db99c227152f27c43ccfa836a129268cdda40;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/harness b/t/harness
index 17a6ffb..88a7bfa 100644
--- a/t/harness
+++ b/t/harness
@@ -127,7 +127,7 @@ if (@ARGV) {
     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};
@@ -160,7 +160,6 @@ if (@ARGV) {
 	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;
@@ -201,12 +200,29 @@ if ($^O eq 'MSWin32') {
 @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        => \&_run_test,
+    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) {
@@ -224,9 +240,21 @@ 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->runtests(@tests);
-exit(0);
+
+$h->callback(
+	     made_parser => sub {
+		 my ($parser, $job) = @_;
+		 my $test = $job->[0];
+		 my $options = delete $options{$test};
+		 _after_fork($options);
+	     }
+	     );
+
+my $agg = $h->runtests(@tests);
+exit $agg->has_errors ? 1 : 0;