X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstrict.t;h=02f191b9c5268ada73b9a7add24fd650cc27eafe;hb=83272a45226e83bd136d713158e9b44ace2dbc8d;hp=6067ad39bf4876ba3e009e96b5549399c9daa794;hpb=8a6cb2cbf33b292e9c5c2689417fb9f525f67df2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/strict.t b/lib/strict.t
index 6067ad3..02f191b 100644
--- a/lib/strict.t
+++ b/lib/strict.t
@@ -13,12 +13,12 @@ my $Is_MSWin32 = $^O eq 'MSWin32';
 my $Is_NetWare = $^O eq 'NetWare';
 my $tmpfile = "tmp0000";
 my $i = 0 ;
-1 while -f ++$tmpfile;
+1 while -e ++$tmpfile;
 END { if ($tmpfile) { 1 while unlink $tmpfile; } }
 
 my @prgs = () ;
 
-foreach (sort glob($^O eq 'MacOS' ? ":lib::strict:*" : "lib/strict/*")) {
+foreach (sort glob($^O eq 'MacOS' ? ":lib:strict:*" : "lib/strict/*")) {
 
     next if /(~|\.orig|,v)$/;
 
@@ -31,7 +31,7 @@ foreach (sort glob($^O eq 'MacOS' ? ":lib::strict:*" : "lib/strict/*")) {
         local $/ = undef;
         @prgs = (@prgs, split "\n########\n", <F>) ;
     }
-    close F ;
+    close F or die "Could not close: $!" ;
 }
 
 undef $/;
@@ -59,21 +59,21 @@ for (@prgs){
     	    push @temps, $filename ;
 	    open F, ">$filename" or die "Cannot open $filename: $!\n" ;
 	    print F $code ;
-	    close F ;
+	    close F or die "Could not close: $!" ;
 	}
 	shift @files ;
 	$prog = shift @files ;
 	$prog =~ s|\./abc|:abc|g if $^O eq 'MacOS';
     }
-    open TEST, ">$tmpfile";
+    open TEST, ">$tmpfile" or die "Could not open: $!";
     print TEST $prog,"\n";
-    close TEST;
+    close TEST or die "Could not close: $!";
     my $results = $Is_MSWin32 ?
-                  `.\\perl -I../lib $switch $tmpfile 2>&1` :
-                  $^O eq 'MacOS' ?
-                  `$^X -I::lib $switch $tmpfile` :
+	              `.\\perl -I../lib $switch $tmpfile 2>&1` :
                   $^O eq 'NetWare' ?
-                  `perl -I../lib $switch $tmpfile 2>&1` :
+		      `perl -I../lib $switch $tmpfile 2>&1` :
+                  $^O eq 'MacOS' ?
+		      `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
                   `./perl $switch $tmpfile 2>&1`;
     my $status = $?;
     $results =~ s/\n+$//;