Fix test failures caused by Archive-Extract upgrade

[perl5.git] / lib / strict.t

diff --git a/lib/strict.t b/lib/strict.t
index 16dcbec..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 = () ;
 
@@ -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: $!";
@@ -78,7 +77,7 @@ for (@prgs){
     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';