Fix test failures caused by Archive-Extract upgrade

[perl5.git] / lib / strict.t

diff --git a/lib/strict.t b/lib/strict.t
index a95b563..bfe6b63 100644 (file)
--- a/lib/strict.t
+++ b/lib/strict.t
@@ -4,6 +4,7 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     $ENV{PERL5LIB} = '../lib';
+    require './test.pl';
 }
 
 $| = 1;
@@ -11,10 +12,7 @@ $| = 1;
 my $Is_VMS = $^O eq 'VMS';
 my $Is_MSWin32 = $^O eq 'MSWin32';
 my $Is_NetWare = $^O eq 'NetWare';
-my $tmpfile = "tmp0000";
 my $i = 0 ;
-1 while -e ++$tmpfile;
-END { if ($tmpfile) { 1 while unlink $tmpfile; } }
 
 my @prgs = () ;
 
@@ -36,7 +34,7 @@ foreach (sort glob($^O eq 'MacOS' ? ":lib:strict:*" : "lib/strict/*")) {
 
 undef $/;
 
-print "1..", @prgs + 4, "\n";
+print "1.." . (@prgs + 4) . "\n";
  
  
 for (@prgs){
@@ -65,6 +63,7 @@ for (@prgs){
        $prog = shift @files ;
        $prog =~ s|\./abc|:abc|g if $^O eq 'MacOS';
     }
+    my $tmpfile = tempfile();
     open TEST, ">$tmpfile" or die "Could not open: $!";
     print TEST $prog,"\n";
     close TEST or die "Could not close: $!";
@@ -74,43 +73,46 @@ for (@prgs){
                      `perl -I../lib $switch $tmpfile 2>&1` :
                   $^O eq 'MacOS' ?
                      `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
-                  `./perl $switch $tmpfile 2>&1`;
+                  `$^X $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;
     # allow expected output to be written as if $prog is on STDIN
-    $results =~ s/tmp\d+/-/g;
+    $results =~ s/tmp\d+[A-Z][A-Z]?/-/g;
     $results =~ s/\n%[A-Z]+-[SIWEF]-.*$// if $Is_VMS;  # clip off DCL status msg
     $expected =~ s/\n+$//;
     $expected =~ s|(\./)?abc\.pm|:abc.pm|g if $^O eq 'MacOS';
     $expected =~ s|./abc|:abc|g if $^O eq 'MacOS';
     my $prefix = ($results =~ s/^PREFIX\n//) ;
+    my $TODO = $prog =~ m/^#\s*TODO:/;
     if ( $results =~ s/^SKIPPED\n//) {
        print "$results\n" ;
     }
     elsif (($prefix and $results !~ /^\Q$expected/) or
           (!$prefix and $results ne $expected)){
-        print STDERR "PROG: $switch\n$prog\n";
-        print STDERR "EXPECTED:\n$expected\n";
-        print STDERR "GOT:\n$results\n";
+        if (! $TODO) {
+            print STDERR "PROG: $switch\n$prog\n";
+            print STDERR "EXPECTED:\n$expected\n";
+            print STDERR "GOT:\n$results\n";
+        }
         print "not ";
     }
-    print "ok ", ++$i, "\n";
+    print "ok " . ++$i . ($TODO ? " # TODO" : "") . "\n";
     foreach (@temps) 
        { unlink $_ if $_ } 
 }
 
 eval qq(use strict 'garbage');
-print +($@ =~ /^Don't know how to 'use strict qw\(garbage\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'garbage'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";
 
 eval qq(no strict 'garbage');
-print +($@ =~ /^Don't know how to 'no strict qw\(garbage\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'garbage'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";
 
 eval qq(use strict qw(foo bar));
-print +($@ =~ /^Don't know how to 'use strict qw\(foo bar\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'foo bar'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";
 
 eval qq(no strict qw(foo bar));
-print +($@ =~ /^Don't know how to 'no strict qw\(foo bar\)/)
+print +($@ =~ /^Unknown 'strict' tag\(s\) 'foo bar'/)
        ? "ok ".++$i."\n" : "not ok ".++$i."\t# $@";