Upgrade to Tie::File 0.90, from mjd.

[p5sagit/p5-mst-13.2.git] / lib / Tie / File / t / 16_handle.t

diff --git a/lib/Tie/File/t/16_handle.t b/lib/Tie/File/t/16_handle.t
index a438612..6d212a1 100644 (file)
--- a/lib/Tie/File/t/16_handle.t
+++ b/lib/Tie/File/t/16_handle.t
@@ -4,6 +4,12 @@
 # instead of from a filename
 
 my $file = "tf$$.txt";
+$: = Tie::File::_default_recsep();
+
+if ($^O =~ /vms/i) {
+  print "1..0\n";
+  exit;
+}
 
 print "1..39\n";
 
@@ -14,8 +20,9 @@ print "ok $N\n"; $N++;
 use Fcntl 'O_CREAT', 'O_RDWR';
 sysopen F, $file, O_CREAT | O_RDWR 
   or die "Couldn't create temp file $file: $!; aborting";
+binmode F;
 
-my $o = tie @a, 'Tie::File', \*F;
+my $o = tie @a, 'Tie::File', \*F, autochomp => 0, autodefer => 0;
 print $o ? "ok $N\n" : "not ok $N\n";
 $N++;
 
@@ -72,27 +79,38 @@ undef $o;
 untie @a;
 
 # Does it correctly detect a non-seekable handle?
-{  eval {pipe *R, *W};
-   close R;
+{  if ($^O =~ /^(MSWin32|dos)$/) {
+     print "ok $N # skipped ($^O has broken pipe semantics)\n";
+     last;
+   }
+   my $pipe_succeeded = eval {pipe *R, *W};
    if ($@) {
-     print "ok $N # skipped\n";
+     chomp $@;
+     print "ok $N # skipped (no pipes: $@)\n";
+     last;
+   } elsif (! $pipe_succeeded) {
+     print "ok $N # skipped (pipe call failed: $!)\n";
      last;
    }
+   close R;
    $o = eval {tie @a, 'Tie::File', \*W};
-   if ($@ && $@ =~ /filehandle does not appear to be seekable/) {
-     print "ok $N\n";
+   if ($@) {
+     if ($@ =~ /filehandle does not appear to be seekable/) {
+       print "ok $N\n";
+     } else {
+       chomp $@;
+       print "not ok $N \# \$\@ is $@\n";
+     }
    } else {
-     print "not ok $N\n";
+       print "not ok $N \# passing pipe to TIEARRAY didn't abort program\n";
    }
    $N++;
 }
 
-# try inserting a record into the middle of an empty file
-
 use POSIX 'SEEK_SET';
 sub check_contents {
   my @c = @_;
-  my $x = join $/, @c, '';
+  my $x = join $:, @c, '';
   local *FH = $o->{fh};
   seek FH, 0, SEEK_SET;
 #  my $open = open FH, "< $file";
@@ -102,8 +120,8 @@ sub check_contents {
   if ($a eq $x) {
     print "ok $N\n";
   } else {
-    s{$/}{\\n}g for $a, $x;
-    print "not ok $N\n# expected <$x>, got <$a>\n";
+    ctrlfix(my $msg = "# expected <$x>, got <$a>");
+    print "not ok $N\n$msg\n";
   }
   $N++;
 
@@ -111,9 +129,9 @@ sub check_contents {
   my $good = 1;
   my $msg;
   for (0.. $#c) {
-    unless ($a[$_] eq "$c[$_]$/") {
-      $msg = "expected $c[$_]$/, got $a[$_]";
-      $msg =~ s{$/}{\\n}g;
+    unless ($a[$_] eq "$c[$_]$:") {
+      $msg = "expected $c[$_]$:, got $a[$_]";
+      ctrlfix($msg);
       $good = 0;
     }
   }
@@ -121,6 +139,14 @@ sub check_contents {
   $N++;
 }
 
+
+sub ctrlfix {
+  for (@_) {
+    s/\n/\\n/g;
+    s/\r/\\r/g;
+  }
+}
+
 END {
   undef $o;
   untie @a;