Be portable.

p4raw-id: //depot/perl@6778

3 files changed, 7 insertions, 4 deletions

diff --git a/t/lib/st-forgive.t b/t/lib/st-forgive.t
index fd5204f0d1..e5272f03b2 100644
--- a/t/lib/st-forgive.t
+++ b/t/lib/st-forgive.t
@@ -29,6 +29,7 @@ sub BEGIN {
 }
 
 use Storable qw(store retrieve);
+use File::Spec;
 
 print "1..8\n";
 
@@ -42,6 +43,8 @@ print (($@ ne '')?"ok $test\n":"not ok $test\n"); $test++;
 
 $Storable::forgive_me=1;
 
+my $devnull = File::Spec->devnull;
+
 open(SAVEERR, ">&STDERR");
 open(STDERR, ">/dev/null") or 
   ( print SAVEERR "Unable to redirect STDERR: $!\n" and exit(1) );
@@ -60,4 +63,4 @@ print (($ret->[2] eq 'bar')?"ok $test\n":"not ok $test\n"); $test++;
 print ((ref $ret->[1] eq 'SCALAR')?"ok $test\n":"not ok $test\n"); $test++;
 
 
-END { unlink 'store' }
+END { 1 while unlink 'store' }
diff --git a/t/lib/st-retrieve.t b/t/lib/st-retrieve.t
index b38904a0e4..2aec8f5a37 100644
--- a/t/lib/st-retrieve.t
+++ b/t/lib/st-retrieve.t
@@ -73,5 +73,5 @@ print "ok 13\n";
 print "not " if length $root->[1];
 print "ok 14\n";
 
-END { unlink 'store', 'nstore' }
+END { 1 while unlink('store', 'nstore') }
 
diff --git a/t/lib/st-store.t b/t/lib/st-store.t
index c49a71dbcb..dd14617a39 100644
--- a/t/lib/st-store.t
+++ b/t/lib/st-store.t
@@ -52,7 +52,7 @@ print "ok 4\n";
 print "not " unless $got eq $dumped; 
 print "ok 5\n";
 
-unlink 'store';
+1 while unlink 'store';
 
 package FOO; @ISA = qw(Storable);
 
@@ -114,6 +114,6 @@ print "not " unless $@;
 print "ok 20\n";
 
 close OUT;
-END { unlink 'store' }
+END { 1 while unlink 'store' }