Adapt harness to the new TEST infrastructure

[p5sagit/p5-mst-13.2.git] / t / TEST

diff --git a/t/TEST b/t/TEST
index 39333af..f004f9b 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -145,11 +145,11 @@ sub _scan_test {
 
     my $switch = "";
     if ($first_line =~ /#!.*\bperl.*\s-\w*([tT])/) {
-        $switch = qq{"-$1"};
+        $switch = "-$1";
     } else {
         if ($::taintwarn) {
             # not all tests are expected to pass with this option
-            $switch = '"-t"';
+            $switch = '-t';
         } else {
             $switch = '';
         }
@@ -204,33 +204,22 @@ sub _scan_test {
     };
 }
 
-sub _run_test {
-    my($harness, $test, $type) = @_;
-    if (!defined $type) {
-       # To conform to the interface expected by exec in TAP::Harness
-       $type = 'perl';
-    }
+sub _cmd {
+    my($options, $type) = @_;
 
-    my $options = _scan_test($test, $type);
-
-    $test = $options->{test}; # Might have changed if we're in ext/Foo
-
-    if ($options->{run_dir}) {
-       my $run_dir = $options->{run_dir};
-       chdir $run_dir or die "Can't chdir to '$run_dir': $!";
-    }
+    my $test = $options->{test};
 
-    my $results;
+    my $cmd;
     if ($type eq 'deparse') {
         my $perl = "$options->{perl} $options->{testswitch}";
         my $lib = $options->{lib};
-        my $deparse_cmd =
+
+        $cmd = (
           "$perl $options->{switch} -I$lib -MO=-qq,Deparse,-sv1.,".
           "-l$::deparse_opts$options->{file} ".
           "$test > $test.dp ".
-          "&& $perl $options->{switch} -I$lib $test.dp |";
-        open($results, $deparse_cmd)
-          or print "can't deparse '$deparse_cmd': $!.\n";
+          "&& $perl $options->{switch} -I$lib $test.dp"
+        );
     }
     elsif ($type eq 'perl') {
         my $perl = $options->{perl};
@@ -241,22 +230,60 @@ sub _run_test {
             my $vg_opts = $ENV{VG_OPTS}
               //  "--suppressions=perl.supp --leak-check=yes "
                 . "--leak-resolution=high --show-reachable=yes "
-                  . "--num-callers=50"; 
+                  . "--num-callers=50";
             $perl = "$valgrind --log-fd=3 $vg_opts $perl";
             $redir = "3>$Valgrind_Log";
         }
 
         my $args = "$options->{testswitch} $options->{switch} $options->{utf8}";
-        my $run = $perl . _quote_args($args) . " $test $redir|";
-        open($results, $run) or print "can't run '$run': $!.\n";
+        $cmd = $perl . _quote_args($args) . " $test $redir";
     }
 
+    return $cmd;
+}
+
+sub _before_fork {
+    my ($options) = @_;
+
+    if ($options->{run_dir}) {
+       my $run_dir = $options->{run_dir};
+       chdir $run_dir or die "Can't chdir to '$run_dir': $!";
+    }
+
+    return;
+}
+
+sub _after_fork {
+    my ($options) = @_;
+
     if ($options->{return_dir}) {
        my $return_dir = $options->{return_dir};
        chdir $return_dir
           or die "Can't chdir from '$options->{run_dir}' to '$return_dir': $!";
     }
 
+    return;
+}
+
+sub _run_test {
+    my($harness, $test, $type) = @_;
+    if (!defined $type) {
+       # To conform to the interface expected by exec in TAP::Harness
+       $type = 'perl';
+    }
+
+    my $options = _scan_test($test, $type);
+
+    $test = $options->{test}; # Might have changed if we're in ext/Foo
+
+    _before_fork($options);
+
+    my $cmd = _cmd($options, $type);
+
+    open(my $results, "$cmd |") or print "can't run '$cmd': $!.\n";
+
+    _after_fork($options);
+
     # Our environment may force us to use UTF-8, but we can't be sure that
     # anything we're reading from will be generating (well formed) UTF-8
     # This may not be the best way - possibly we should unset ${^OPEN} up