[win32] merge change#886 from maintbranch

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

diff --git a/t/lib/filecopy.t b/t/lib/filecopy.t
index 0a5f4c1..e4bde30 100755 (executable)
--- a/t/lib/filecopy.t
+++ b/t/lib/filecopy.t
@@ -13,6 +13,7 @@ use File::Copy;
 
 # First we create a file
 open(F, ">file-$$") or die;
+binmode F; # for DOSISH platforms, because test 3 copies to stdout
 print F "ok 3\n";
 close F;
 
@@ -28,57 +29,62 @@ print "ok 1\n";
 print "not " unless $foo eq "ok 3\n";
 print "ok 2\n";
 
+binmode STDOUT;                        # Copy::copy works in binary mode
 copy "copy-$$", \*STDOUT;
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 
 open(F,"file-$$");
 copy(*F, "copy-$$");
-open(R, "copy-$$") or die; $foo = <R>; close(R);
+open(R, "copy-$$") or die "open copy-$$: $!"; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n";
 print "ok 4\n";
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 open(F,"file-$$");
 copy(\*F, "copy-$$");
-open(R, "copy-$$") or die; $foo = <R>; close(R);
+close(F) or die "close: $!";
+open(R, "copy-$$") or die; $foo = <R>; close(R) or die "close: $!";
 print "not " unless $foo eq "ok 3\n";
 print "ok 5\n";
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 
 require IO::File;
 $fh = IO::File->new(">copy-$$") or die "Cannot open copy-$$:$!";
+binmode $fh or die;
 copy("file-$$",$fh);
-$fh->close;
+$fh->close or die "close: $!";
 open(R, "copy-$$") or die; $foo = <R>; close(R);
-print "not " unless $foo eq "ok 3\n";
+print "# foo=`$foo'\nnot " unless $foo eq "ok 3\n";
 print "ok 6\n";
-unlink "copy-$$";
+unlink "copy-$$" or die "unlink: $!";
 require FileHandle;
 my $fh = FileHandle->new(">copy-$$") or die "Cannot open copy-$$:$!";
+binmode $fh or die;
 copy("file-$$",$fh);
 $fh->close;
 open(R, "copy-$$") or die; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n";
 print "ok 7\n";
-unlink "file-$$";
+unlink "file-$$" or die "unlink: $!";
 
-print "not " if move("file-$$", "copy-$$") or not -e "copy-$$";
+print "# moved missing file.\nnot " if move("file-$$", "copy-$$");
+print "# target disappeared.\nnot " if not -e "copy-$$";
 print "ok 8\n";
 
-move "copy-$$", "file-$$";
-print "not " unless -e "file-$$" and not -e "copy-$$";
+move "copy-$$", "file-$$" or print "# move did not succeed.\n";
+print "# not moved: $!\nnot " unless -e "file-$$" and not -e "copy-$$";
 open(R, "file-$$") or die; $foo = <R>; close(R);
-print "not " unless $foo eq "ok 3\n";
+print "# foo=`$foo'\nnot " unless $foo eq "ok 3\n";
 print "ok 9\n";
 
 copy "file-$$", "lib";
 open(R, "lib/file-$$") or die; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n";
 print "ok 10\n";
-unlink "lib/file-$$";
+unlink "lib/file-$$" or die "unlink: $!";
 
 move "file-$$", "lib";
-open(R, "lib/file-$$") or die; $foo = <R>; close(R);
+open(R, "lib/file-$$") or die "open lib/file-$$: $!"; $foo = <R>; close(R);
 print "not " unless $foo eq "ok 3\n" and not -e "file-$$";;
 print "ok 11\n";
-unlink "lib/file-$$";
+unlink "lib/file-$$" or die "unlink: $!";