From: Vincent Pit <perl@profvince.com>
Date: Mon, 31 Aug 2009 17:01:50 +0000 (+0200)
Subject: Adapt harness to the new TEST infrastructure
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4013a0e1f891d6d7f41d456bab1a516334fddad8;p=p5sagit%2Fp5-mst-13.2.git

Adapt harness to the new TEST infrastructure

The new harness gathers the test options by calling _scan_test() and _cmd()
in the exec callback and, if needed, chdirs into the right ext/ subdirectory
in a parser_args callback and back to t/ when the parser is made.
---

diff --git a/t/harness b/t/harness
index 17a6ffb..51de53a 100644
--- a/t/harness
+++ b/t/harness
@@ -201,12 +201,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 +241,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->callback(
+	     made_parser => sub {
+		 my ($parser, $job) = @_;
+		 my $test = $job->[0];
+		 my $options = delete $options{$test};
+		 _after_fork($options);
+	     }
+	     );
+
 $h->runtests(@tests);
 exit(0);