Refactor t/harness to always use TAP::Harness.

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

diff --git a/t/TEST b/t/TEST
index 8484e45..aa663c5 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -11,8 +11,8 @@ my $Valgrind_Log = 'current.valgrind';
 $| = 1;
 
 # for testing TEST only
-#BEGIN { require '../lib/strict.pm'; strict->import() };
-#BEGIN { require '../lib/warnings.pm'; warnings->import() };
+#BEGIN { require '../lib/strict.pm'; "strict"->import() };
+#BEGIN { require '../lib/warnings.pm'; "warnings"->import() };
 
 # Let tests know they're running in the perl core.  Useful for modules
 # which live dual lives on CPAN.
@@ -70,7 +70,6 @@ $ENV{PERL_DESTRUCT_LEVEL} = 2 unless exists $ENV{PERL_DESTRUCT_LEVEL};
 $ENV{EMXSHELL} = 'sh';        # For OS/2
 
 # Roll your own File::Find!
-use TestInit;
 if ($show_elapsed_time) { require Time::HiRes }
 
 my %skip = (
@@ -139,21 +138,24 @@ sub _run_test {
 
     my $options = _scan_test($test, $type);
 
-    my $utf8 = $::with_utf8 ? '-I../lib -Mutf8' : '';
-    my $testswitch = '-I. -MTestInit'; # -T will strict . from @INC
+    my $perl = './perl';
+    my $lib  = '../lib';
+
+    my $utf8 = $::with_utf8 ? '-I$lib -Mutf8' : '';
+    my $testswitch = '-I. -MTestInit';  # -T will remove . from @INC
 
     my $results;
     if ($type eq 'deparse') {
         my $deparse_cmd =
-          "./perl $testswitch $options->{switch} -I../lib -MO=-qq,Deparse,-sv1.,".
+          "$perl $testswitch $options->{switch} -I$lib -MO=-qq,Deparse,-sv1.,".
           "-l$::deparse_opts$options->{file} ".
           "$test > $test.dp ".
-          "&& ./perl $testswitch $options->{switch} -I../lib $test.dp |";
+          "&& $perl $testswitch $options->{switch} -I$lib $test.dp |";
         open($results, $deparse_cmd)
           or print "can't deparse '$deparse_cmd': $!.\n";
     }
     elsif ($type eq 'perl') {
-        my $perl = $ENV{PERL} || './perl';
+        my $perl = $ENV{PERL} || $perl;
         my $redir = $^O eq 'VMS' ? '2>&1' : '';
 
         if ($ENV{PERL_VALGRIND}) {
@@ -166,7 +168,7 @@ sub _run_test {
             $redir = "3>$Valgrind_Log";
         }
 
-        my $run = "$perl" . _quote_args("$testswitch $options->{switch} $utf8")
+        my $run = $perl . _quote_args("$testswitch $options->{switch} $utf8")
           . " $test $redir|";
         open($results, $run) or print "can't run '$run': $!.\n";
     }