Clean up CBuilder and ParseXS test files

This was done once already in change 25222, but then modified in change
25225.  The new versions of CBuilder and ParseXS that sync'ed those
changes and have now been integrated back into bleadperl missed some
bits of change 25225.  Try again.

p4raw-id: //depot/perl@25652

5 files changed, 11 insertions, 4 deletions

diff --git a/lib/ExtUtils/CBuilder.pm b/lib/ExtUtils/CBuilder.pm
index f137a00eb1..3063a81719 100644
--- a/lib/ExtUtils/CBuilder.pm
+++ b/lib/ExtUtils/CBuilder.pm
@@ -5,7 +5,7 @@ use File::Path ();
 use File::Basename ();
 
 use vars qw($VERSION @ISA);
-$VERSION = '0.14';
+$VERSION = '0.14_01';
 $VERSION = eval $VERSION;
 
 # Okay, this is the brute-force method of finding out what kind of
diff --git a/lib/ExtUtils/CBuilder/t/01-basic.t b/lib/ExtUtils/CBuilder/t/01-basic.t
index b13f4d0bdc..9f14e8f0a7 100644
--- a/lib/ExtUtils/CBuilder/t/01-basic.t
+++ b/lib/ExtUtils/CBuilder/t/01-basic.t
@@ -47,7 +47,10 @@ my ($lib, @temps) = $b->link(objects => $object_file,
 $lib =~ tr/"'//d;
 ok $lib_file, $lib;
 
-unlink $source_file;
+for ($source_file, $object_file, $lib_file) {
+  tr/"'//d;
+  1 while unlink;
+}
 
 my @words = $b->split_like_shell(' foo bar');
 ok @words, 2;
diff --git a/lib/ExtUtils/CBuilder/t/02-link.t b/lib/ExtUtils/CBuilder/t/02-link.t
index ccfe4ee182..604e474134 100644
--- a/lib/ExtUtils/CBuilder/t/02-link.t
+++ b/lib/ExtUtils/CBuilder/t/02-link.t
@@ -55,7 +55,10 @@ ok $exe_file;
 ok my_system($exe_file), 11;
 
 # Clean up
-unlink $source_file;
+for ($source_file, $object_file, $exe_file) {
+  tr/"'//d;
+  1 while unlink;
+}
 
 sub my_system {
   my $cmd = shift;
diff --git a/lib/ExtUtils/ParseXS.pm b/lib/ExtUtils/ParseXS.pm
index adad27f9e6..6167b2e06b 100644
--- a/lib/ExtUtils/ParseXS.pm
+++ b/lib/ExtUtils/ParseXS.pm
@@ -17,7 +17,7 @@ my(@XSStack);	# Stack of conditionals and INCLUDEs
 my($XSS_work_idx, $cpp_next_tmp);
 
 use vars qw($VERSION);
-$VERSION = '2.12';
+$VERSION = '2.12_01';
 
 use vars qw(%input_expr %output_expr $ProtoUsed @InitFileCode $FH $proto_re $Overload $errors $Fallback
 	    $cplusplus $hiertype $WantPrototypes $WantVersionChk $except $WantLineNumbers
diff --git a/lib/ExtUtils/ParseXS/t/basic.t b/lib/ExtUtils/ParseXS/t/basic.t
index 520b8777c8..9b5319e56a 100644
--- a/lib/ExtUtils/ParseXS/t/basic.t
+++ b/lib/ExtUtils/ParseXS/t/basic.t
@@ -64,6 +64,7 @@ if ($b->have_compiler) {
       }
     }
   }
+  1 while unlink $obj_file;
   1 while unlink $lib_file;
 } else {
   skip "Skipped can't find a C compiler & linker", 1 for 1..7;