Replace system by print in strictures/parsing regression test

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

diff --git a/t/TEST b/t/TEST
index d20f94e..e293a5c 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 = '';
         }
@@ -189,9 +189,9 @@ sub _scan_test {
        }
     }
 
-    my $utf8 = $::with_utf8 ? '-I$lib -Mutf8' : '';
+    my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
 
-    return {
+    my %options = (
        perl => $perl,
        lib => $lib,
        test => $test,
@@ -201,7 +201,9 @@ sub _scan_test {
        utf8 => $utf8,
        file => $file_opts,
        switch => $switch,
-    };
+    );
+
+    return \%options;
 }
 
 sub _cmd {
@@ -242,25 +244,19 @@ sub _cmd {
     return $cmd;
 }
 
-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
+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': $!";
     }
 
-    my $cmd = _cmd($options, $type);
+    return;
+}
 
-    open(my $results, "$cmd |") or print "can't run '$cmd': $!.\n";
+sub _after_fork {
+    my ($options) = @_;
 
     if ($options->{return_dir}) {
        my $return_dir = $options->{return_dir};
@@ -268,6 +264,24 @@ sub _run_test {
           or die "Can't chdir from '$options->{run_dir}' to '$return_dir': $!";
     }
 
+    return;
+}
+
+sub _run_test {
+    my ($test, $type) = @_;
+
+    my $options = _scan_test($test, $type);
+    # $test might have changed if we're in ext/Foo, so don't use it anymore
+    # from now on. Use $options->{test} instead.
+
+    _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
@@ -468,7 +482,7 @@ EOT
            $te = '';
        }
 
-        my $results = _run_test(undef, $test, $type);
+       my $results = _run_test($test, $type);
 
        my $failure;
        my $next = 0;