perl 3.0 patch #3 Patch #2 continued

6 files changed, 16 insertions, 12 deletions

diff --git a/t/TEST b/t/TEST
index e9ed3e9d4b..a554c3491e 100644
--- a/t/TEST
+++ b/t/TEST
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: TEST,v 3.0 89/10/18 15:24:06 lwall Locked $
+# $Header: TEST,v 3.0.1.1 89/11/11 04:58:01 lwall Locked $
 
 # This is written in a peculiar style, since we're trying to avoid
 # most of the constructs we'll be testing for.
@@ -30,6 +30,9 @@ while ($test = shift) {
     if ($test =~ /\.orig$/) {
 	next;
     }
+    if ($test =~ /\.rej$/) {
+	next;
+    }
     if ($test =~ /~$/) {
 	next;
     }
diff --git a/t/io.argv b/t/io.argv
index 2284e9fcd3..a66d26f2e2 100644
--- a/t/io.argv
+++ b/t/io.argv
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: io.argv,v 3.0 89/10/18 15:26:10 lwall Locked $
+# $Header: io.argv,v 3.0.1.1 89/11/11 04:59:05 lwall Locked $
 
 print "1..5\n";
 
@@ -18,7 +18,7 @@ if ($x eq "a line\nfoo\n") {print "ok 2\n";} else {print "not ok 2\n";}
 
 $x = `echo foo|./perl -e 'while (<>) {print $_;}'`;
 
-if ($x eq "foo\n") {print "ok 3\n";} else {print "not ok 3\n";}
+if ($x eq "foo\n") {print "ok 3\n";} else {print "not ok 3 :$x:\n";}
 
 @ARGV = ('Io.argv.tmp', 'Io.argv.tmp', '/dev/null', 'Io.argv.tmp');
 while (<>) {
diff --git a/t/op.magic b/t/op.magic
index 9468a35573..4b5dba838e 100644
--- a/t/op.magic
+++ b/t/op.magic
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: op.magic,v 3.0 89/10/18 15:29:54 lwall Locked $
+# $Header: op.magic,v 3.0.1.1 89/11/11 05:00:07 lwall Locked $
 
 $| = 1;		# command buffering
 
@@ -9,8 +9,9 @@ print "1..5\n";
 eval '$ENV{"foo"} = "hi there";';	# check that ENV is inited inside eval
 if (`echo \$foo` eq "hi there\n") {print "ok 1\n";} else {print "not ok 1\n";}
 
+unlink 'ajslkdfpqjsjfk';
 $! = 0;
-open(foo,'ajslkdfpqjsjfkslkjdflksd');
+open(foo,'ajslkdfpqjsjfk');
 if ($! == 2) {print "ok 2\n";} else {print "not ok 2\n";}
 
 # the next tests are embedded inside system simply because sh spits out
diff --git a/t/op.mkdir b/t/op.mkdir
index 93e2ccdde4..99e04b0057 100644
--- a/t/op.mkdir
+++ b/t/op.mkdir
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: op.mkdir,v 3.0 89/10/18 15:30:05 lwall Locked $
+# $Header: op.mkdir,v 3.0.1.1 89/11/11 05:00:47 lwall Locked $
 
 print "1..7\n";
 
@@ -8,8 +8,8 @@ print "1..7\n";
 
 print (mkdir('blurfl',0666) ? "ok 1\n" : "not ok 1\n");
 print (mkdir('blurfl',0666) ? "not ok 2\n" : "ok 2\n");
-print ($! == 17 ? "ok 3\n" : "not ok 3\n");
+print ($! =~ /exists/ ? "ok 3\n" : "not ok 3\n");
 print (-d 'blurfl' ? "ok 4\n" : "not ok 4\n");
 print (rmdir('blurfl') ? "ok 5\n" : "not ok 5\n");
 print (rmdir('blurfl') ? "not ok 6\n" : "ok 6\n");
-print ($! == 2 ? "ok 7\n" : "not ok 7\n");
+print ($! =~ /such/ ? "ok 7\n" : "not ok 7\n");
diff --git a/t/op.split b/t/op.split
index 2018ac9f62..c42b98b253 100644
--- a/t/op.split
+++ b/t/op.split
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: op.split,v 3.0 89/10/18 15:31:24 lwall Locked $
+# $Header: op.split,v 3.0.1.1 89/11/11 05:01:44 lwall Locked $
 
 print "1..12\n";
 
@@ -48,7 +48,7 @@ print $_ eq '1:2:3:4:5:6:::' ? "ok 10\n" : "not ok 10 $_\n";
 
 # Does assignment to a list imply split to one more field than that?
 $foo = `./perl -D1024 -e '(\$a,\$b) = split;' 2>&1`;
-print $foo eq '' || $foo =~ /num\(3\)/ ? "ok 11\n" : "not ok 11\n";
+print $foo =~ /DEBUGGING/ || $foo =~ /num\(3\)/ ? "ok 11\n" : "not ok 11\n";
 
 # Can we say how many fields to split to when assigning to a list?
 ($a,$b) = split(' ','1 2 3 4 5 6', 2);
diff --git a/t/op.stat b/t/op.stat
index 72c18a91e7..92f907cc81 100644
--- a/t/op.stat
+++ b/t/op.stat
@@ -1,6 +1,6 @@
 #!./perl
 
-# $Header: op.stat,v 3.0 89/10/18 15:31:33 lwall Locked $
+# $Header: op.stat,v 3.0.1.1 89/11/11 05:02:46 lwall Locked $
 
 print "1..56\n";
 
@@ -75,7 +75,7 @@ if (! -e 'Op.stat.tmp') {print "ok 28\n";} else {print "not ok 28\n";}
 if (-c '/dev/tty') {print "ok 29\n";} else {print "not ok 29\n";}
 if (! -c '.') {print "ok 30\n";} else {print "not ok 30\n";}
 
-if (! -e '/dev/printer' || -S '/dev/printer')
+if (! -e '/dev/printer' || -c '/dev/printer' || -S '/dev/printer')
     {print "ok 31\n";}
 else
     {print "not ok 31\n";}