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 d5007ed..e293a5c 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -24,19 +24,14 @@ my %dir_to_switch =
      );
 
 my %temp_no_core =
-    ('../ext/Attribute-Handlers' => 1,
-     '../ext/B-Debug' => 1,
+    ('../ext/B-Debug' => 1,
      '../ext/Compress-Raw-Bzip2' => 1,
      '../ext/Compress-Raw-Zlib' => 1,
      '../ext/Devel-PPPort' => 1,
      '../ext/Encode' => 1,
-     '../ext/Hash-Util' => 'fixme',
-     '../ext/Hash-Util-FieldHash' => 'fixme',
-     '../ext/I18N-Langinfo' => 'fixme',
      '../ext/IO-Compress' => 1,
      '../ext/IPC-SysV' => 1,
      '../ext/MIME-Base64' => 1,
-     '../ext/Safe' => 'fixme',
      '../ext/Time-HiRes' => 1,
      '../ext/Unicode-Normalize' => 1,
     );
@@ -150,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 = '';
         }
@@ -169,55 +164,67 @@ sub _scan_test {
         }
     }
 
-    return { file => $file_opts, switch => $switch };
-}
-                 
-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);
-    my $return_dir;
+    close $script;
 
     my $perl = './perl';
     my $lib  = '../lib';
+    my $run_dir;
+    my $return_dir;
+
     $test =~ /^(.+)\/[^\/]+/;
     my $dir = $1;
-    my $ext_dir;
-
     my $testswitch = $dir_to_switch{$dir};
     if (!defined $testswitch) {
        if ($test =~ s!^(\.\./ext/[^/]+)/t!t!) {
-           $ext_dir = $1;
+           $run_dir = $1;
            $return_dir = '../../t';
            $lib = '../../lib';
            $perl = '../../t/perl';
            $testswitch = "-I../.. -MTestInit=U2T,A";
-           if ($temp_no_core{$ext_dir}) {
+           if ($temp_no_core{$run_dir}) {
                $testswitch = $testswitch . ',NC';
            }
-           chdir $ext_dir or die "Can't chdir to '$ext_dir': $!";
        } else {
            $testswitch = '-I.. -MTestInit';  # -T will remove . from @INC
        }
     }
 
-    my $utf8 = $::with_utf8 ? '-I$lib -Mutf8' : '';
+    my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
+
+    my %options = (
+       perl => $perl,
+       lib => $lib,
+       test => $test,
+       run_dir => $run_dir,
+       return_dir => $return_dir,
+       testswitch => $testswitch,
+       utf8 => $utf8,
+       file => $file_opts,
+       switch => $switch,
+    );
+
+    return \%options;
+}
+
+sub _cmd {
+    my($options, $type) = @_;
 
-    my $results;
+    my $test = $options->{test};
+
+    my $cmd;
     if ($type eq 'deparse') {
-        my $deparse_cmd =
-          "$perl $testswitch $options->{switch} -I$lib -MO=-qq,Deparse,-sv1.,".
+        my $perl = "$options->{perl} $options->{testswitch}";
+        my $lib = $options->{lib};
+
+        $cmd = (
+          "$perl $options->{switch} -I$lib -MO=-qq,Deparse,-sv1.,".
           "-l$::deparse_opts$options->{file} ".
           "$test > $test.dp ".
-          "&& $perl $testswitch $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};
         my $redir = $^O eq 'VMS' ? '2>&1' : '';
 
         if ($ENV{PERL_VALGRIND}) {
@@ -225,21 +232,56 @@ 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 $run = $perl . _quote_args("$testswitch $options->{switch} $utf8")
-          . " $test $redir|";
-        open($results, $run) or print "can't run '$run': $!.\n";
+        my $args = "$options->{testswitch} $options->{switch} $options->{utf8}";
+        $cmd = $perl . _quote_args($args) . " $test $redir";
     }
 
-    if ($return_dir) {
+    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 '$ext_dir' to '$return_dir': $!";
+          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
@@ -440,7 +482,7 @@ EOT
            $te = '';
        }
 
-        my $results = _run_test(undef, $test, $type);
+       my $results = _run_test($test, $type);
 
        my $failure;
        my $next = 0;