applied patch, and undid change#1302 which it made unnecessary

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

diff --git a/t/lib/filehand.t b/t/lib/filehand.t
index 14a1770..08cae71 100755 (executable)
--- a/t/lib/filehand.t
+++ b/t/lib/filehand.t
@@ -22,7 +22,9 @@ print "1..11\n";
 
 print $mystdout "ok ",fileno($mystdout),"\n";
 
-$fh = new FileHandle "TEST", O_RDONLY and print "ok 2\n";
+$fh = (new FileHandle "./TEST", O_RDONLY
+       or new FileHandle "TEST", O_RDONLY)
+  and print "ok 2\n";
 
 
 $buffer = <$fh>;
@@ -41,7 +43,7 @@ print "not " unless ($fh->open("< TEST") && <$fh> eq $buffer);
 print "ok 5\n";
 
 $fh->seek(0,0);
-print "not " unless (<$fh> eq $buffer);
+print "#possible mixed CRLF/LF in t/TEST\nnot " unless (<$fh> eq $buffer);
 print "ok 6\n";
 
 $fh->seek(0,2);
@@ -62,9 +64,15 @@ autoflush STDOUT 1;
 print "not " unless ($|);
 print "ok 10\n";
 
+if ($^O eq 'dos')
+{
+    printf("ok %d\n",11);
+    exit(0);
+}
+
 ($rd,$wr) = FileHandle::pipe;
 
-if ($^O eq 'VMS' || $^O eq 'os2' || $^O eq 'amigaos') {
+if ($^O eq 'VMS' || $^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'MSWin32') {
   $wr->autoflush;
   $wr->printf("ok %d\n",11);
   print $rd->getline;