Re: [PATCH] test clean-up for VMS

From: "Craig A. Berry" <craigberry@mac.com>
Message-ID: <3F1AB8A4.2070207@mac.com>

p4raw-id: //depot/perl@20175

8 files changed, 13 insertions, 9 deletions

diff --git a/ext/PerlIO/t/encoding.t b/ext/PerlIO/t/encoding.t
index 06a0ba7e72..23266a02b0 100644
--- a/ext/PerlIO/t/encoding.t
+++ b/ext/PerlIO/t/encoding.t
@@ -151,5 +151,5 @@ print "not " unless ($dstr eq $str);
 print "ok 14\n";
 
 END {
-    unlink($grk, $utf, $fail1, $fail2, $russki, $threebyte);
+    1 while unlink($grk, $utf, $fail1, $fail2, $russki, $threebyte);
 }
diff --git a/lib/File/Spec/t/rel2abs2rel.t b/lib/File/Spec/t/rel2abs2rel.t
index 4c2e2bb993..34f313c4dc 100644
--- a/lib/File/Spec/t/rel2abs2rel.t
+++ b/lib/File/Spec/t/rel2abs2rel.t
@@ -14,8 +14,8 @@ BEGIN {                                # Set up a tiny script file
     close(F);
 }
 END {
-    unlink("rel2abs2rel$$.pl");
-    unlink("rel2abs2rel$$.tmp");
+    1 while unlink("rel2abs2rel$$.pl");
+    1 while unlink("rel2abs2rel$$.tmp");
 }
 
 use Config;
diff --git a/lib/FileCache/t/01open.t b/lib/FileCache/t/01open.t
index dfbb7b0a0b..fa7f5f0e08 100644
--- a/lib/FileCache/t/01open.t
+++ b/lib/FileCache/t/01open.t
@@ -10,7 +10,7 @@ BEGIN {
     END;
 }
 END{
-  unlink @files;
+  1 while unlink @files;
 }
 
 
diff --git a/lib/FileCache/t/02maxopen.t b/lib/FileCache/t/02maxopen.t
index 6b3b4c86e7..603edebc7f 100644
--- a/lib/FileCache/t/02maxopen.t
+++ b/lib/FileCache/t/02maxopen.t
@@ -12,7 +12,7 @@ BEGIN {
     plan tests=>5;
 }
 END{
-  unlink @files;
+  1 while unlink @files;
 }
 
 {# Test 2: that we actually adhere to maxopen
diff --git a/lib/FileCache/t/03append.t b/lib/FileCache/t/03append.t
index 07edb7aa79..a6ba6f3aac 100644
--- a/lib/FileCache/t/03append.t
+++ b/lib/FileCache/t/03append.t
@@ -10,7 +10,7 @@ BEGIN {
     END;
 }
 END{
-  unlink @files;
+  1 while unlink @files;
 }
 
 print "1..2\n";
diff --git a/t/io/argv.t b/t/io/argv.t
index f2f3245b10..33c4f1a8e7 100755
--- a/t/io/argv.t
+++ b/t/io/argv.t
@@ -127,6 +127,6 @@ unlink "Io_argv3.tmp";
 **PROG**
 
 END {
-    unlink 'Io_argv1.tmp', 'Io_argv1.tmp_bak',
+    1 while unlink 'Io_argv1.tmp', 'Io_argv1.tmp_bak',
 	'Io_argv2.tmp', 'Io_argv2.tmp_bak', 'Io_argv3.tmp';
 }
diff --git a/t/op/stat.t b/t/op/stat.t
index 89046c364b..69caf8c68a 100755
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -40,7 +40,7 @@ my $tmpfile = 'Op_stat.tmp';
 my $tmpfile_link = $tmpfile.'2';
 
 
-unlink $tmpfile;
+1 while unlink $tmpfile;
 open(FOO, ">$tmpfile") || DIE("Can't open temp test file: $!");
 close FOO;
 
@@ -426,3 +426,7 @@ SKIP: {
 	'-l _ croaks after -T _' );
     unlink $linkname or print "# unlink $linkname failed: $!\n";
 }
+
+END {
+    1 while unlink $tmpfile;
+}
diff --git a/t/uni/write.t b/t/uni/write.t
index 717fcaba54..0d5cedcee0 100644
--- a/t/uni/write.t
+++ b/t/uni/write.t
@@ -101,4 +101,4 @@ $ulite1
 $bmulti$blite2
 EOEXPECT
 
-unlink 'Uni_write.tmp';
+1 while unlink 'Uni_write.tmp';