Integrate perlio:

[p5sagit/p5-mst-13.2.git] / t / lib / filter-util.t

diff --git a/t/lib/filter-util.t b/t/lib/filter-util.t
index 1ec2b8b..4c40463 100644 (file)
--- a/t/lib/filter-util.t
+++ b/t/lib/filter-util.t
@@ -10,24 +10,28 @@ BEGIN {
     require 'lib/filter-util.pl';
 }
 
+use strict;
+use warnings;
+
+use vars qw($Inc $Perl);
+
 print "1..28\n" ;
 
 $Perl = "$Perl -w" ;
 
 use Cwd ;
-$here = getcwd ;
+my $here = getcwd ;
 
-use vars qw($Inc $Perl);
 
-$filename = "call.tst" ;
-$filenamebin = "call.bin" ;
-$module   = "MyTest" ;
-$module2  = "MyTest2" ;
-$module3  = "MyTest3" ;
-$module4  = "MyTest4" ;
-$module5  = "MyTest5" ;
-$nested   = "nested" ;
-$block   = "block" ;
+my $filename = "call.tst" ;
+my $filenamebin = "call.bin" ;
+my $module   = "MyTest" ;
+my $module2  = "MyTest2" ;
+my $module3  = "MyTest3" ;
+my $module4  = "MyTest4" ;
+my $module5  = "MyTest5" ;
+my $nested   = "nested" ;
+my $block   = "block" ;
 
 # Test error cases
 ##################
@@ -45,7 +49,7 @@ sub import { filter_add(bless []) }
 1 ;
 EOM
  
-$a = `$Perl -I. $Inc -e "use ${module} ;"  2>&1` ;
+my $a = `$Perl "-I." $Inc -e "use ${module} ;"  2>&1` ;
 ok(1, (($? >>8) != 0 or ($^O eq 'MSWin32' && $? != 0))) ;
 ok(2, $a =~ /^Can't locate object method "filter" via package "MyTest"/) ;
  
@@ -62,7 +66,7 @@ sub import { filter_add() }
 1 ;
 EOM
  
-$a = `$Perl -I. $Inc -e "use ${module} ;"  2>&1` ;
+$a = `$Perl "-I." $Inc -e "use ${module} ;"  2>&1` ;
 ok(3, (($? >>8) != 0 or ($^O eq 'MSWin32' && $? != 0))) ;
 #ok(4, $a =~ /^usage: filter_add\(ref\) at ${module}.pm/) ;
 ok(4, $a =~ /^Not enough arguments for Filter::Util::Call::filter_add/) ;
@@ -114,7 +118,7 @@ EOF
 
 EOM
 
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(5, ($? >>8) == 0) ;
 ok(6, $a eq <<EOM) ;
 I am $here
@@ -163,7 +167,7 @@ EOF
  
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(7, ($? >>8) == 0) ;
 ok(8, $a eq <<EOM) ;
 I am $here
@@ -278,7 +282,7 @@ EOF
  
 EOM
 
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(9, ($? >>8) == 0) ;
 ok(10, $a eq <<EOM) ;
 I'm feeling used!
@@ -340,7 +344,7 @@ EOF
  
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(11, ($? >>8) == 0) ;
 ok(12, $a eq <<EOM) ;
 some letters PQRPQR PQR PQR
@@ -399,7 +403,7 @@ EOF
  
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(13, ($? >>8) == 0) ;
 ok(14, $a eq <<EOM) ;
 some letters PQRPQR PQR PQR
@@ -459,7 +463,7 @@ F
  
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(15, ($? >>8) == 0) ;
 ok(16, $a eq <<EOM) ;
 don't cut me in half
@@ -495,7 +499,7 @@ sub filter
 1 ;
 EOM
 
-$string = <<'EOM' ;
+my $string = <<'EOM' ;
 print "hello mum\n" ;
 $x = 'me ' x 3 ;
 print "Who wants it?\n$x\n" ;
@@ -506,7 +510,7 @@ writeFile($filename, <<EOM, $string ) ;
 use $block ;
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(17, ($? >>8) == 0) ;
 ok(18, $a eq <<EOM) ;
 hello mum
@@ -537,7 +541,7 @@ sub filter
 {
     my ($self) = @_ ;
     my ($status) ;
-    my ($here) = getcwd ;
+    my ($here) = quotemeta getcwd ;
  
     if (($status = filter_read()) > 0) {
         s/DIR/$here/g
@@ -554,7 +558,7 @@ EOM
 print "We are in DIR\n" ;
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(19, ($? >>8) == 0) ;
 ok(20, $a eq <<EOM) ;
 We are in $here
@@ -605,7 +609,7 @@ I am HERE
 HERE today gone tomorrow\n" ;
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(21, ($? >>8) == 0) ;
 ok(22, $a eq <<EOM) ;
 
@@ -655,7 +659,7 @@ I'm HERE
 HERE today gone tomorrow\n" ;
 EOM
  
-$a = `$Perl -I. $Inc $filenamebin  2>&1` ;
+$a = `$Perl "-I." $Inc $filenamebin  2>&1` ;
 ok(23, ($? >>8) == 0) ;
 ok(24, $a eq <<EOM) ;
 
@@ -709,7 +713,7 @@ I'm HERE
 HERE today gone tomorrow
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(25, ($? >>8) == 0) ;
 ok(26, $a eq <<EOM) ;
 THERE THERE
@@ -765,7 +769,7 @@ I'm HERE
 HERE today gone tomorrow
 EOM
  
-$a = `$Perl -I. $Inc $filename  2>&1` ;
+$a = `$Perl "-I." $Inc $filename  2>&1` ;
 ok(27, ($? >>8) == 0) ;
 ok(28, $a eq <<EOM) ;
 THERE THERE
@@ -777,15 +781,15 @@ EOM
 }
 
 END {
-    unlink $filename ;
-    unlink $filenamebin ;
-    unlink "${module}.pm" ;
-    unlink "${module2}.pm" ;
-    unlink "${module3}.pm" ;
-    unlink "${module4}.pm" ;
-    unlink "${module5}.pm" ;
-    unlink $nested ;
-    unlink "${block}.pm" ;
+    1 while unlink $filename ;
+    1 while unlink $filenamebin ;
+    1 while unlink "${module}.pm" ;
+    1 while unlink "${module2}.pm" ;
+    1 while unlink "${module3}.pm" ;
+    1 while unlink "${module4}.pm" ;
+    1 while unlink "${module5}.pm" ;
+    1 while unlink $nested ;
+    1 while unlink "${block}.pm" ;
 }