Integrate:

[p5sagit/p5-mst-13.2.git] / t / io / crlf.t

diff --git a/t/io/crlf.t b/t/io/crlf.t
index 0968b36..084be21 100644 (file)
--- a/t/io/crlf.t
+++ b/t/io/crlf.t
@@ -15,29 +15,46 @@ END {
 }
 
 if (find PerlIO::Layer 'perlio') {
- plan(tests => 6);
+ plan(tests => 8);
  ok(open(FOO,">:crlf",$file));
  ok(print FOO 'a'.((('a' x 14).qq{\n}) x 2000) || close(FOO));
  ok(open(FOO,"<:crlf",$file));
- my $seen = 0;
- my $cr = "\r";
- while (<FOO>)
-  {
-   $seen += tr/[\015]//;
-  }
- is($seen,0);
+
+ my $text;
+ { local $/; $text = <FOO> }
+ is(count_chars($text, "\015\012"), 0);
+ is(count_chars($text, "\n"), 2000);
+
  binmode(FOO);
  seek(FOO,0,0);
- $seen = 0;
- while (<FOO>)
-  {
-   $seen += tr/[\015]//;
-  }
- is($seen,2000);
+ { local $/; $text = <FOO> }
+ is(count_chars($text, "\015\012"), 2000);
+
+ SKIP:
+ {
+  eval 'use PerlIO::scalar';
+  skip(q/miniperl cannnot load PerlIO::scalar/)
+      if $@ =~ /dynamic loading not available/;
+  my $fcontents = join "", map {"$_\015\012"} "a".."zzz";
+  open my $fh, "<:crlf", \$fcontents;
+  local $/ = "xxx";
+  local $_ = <$fh>;
+  my $pos = tell $fh; # pos must be behind "xxx", before "\nyyy\n"
+  seek $fh, $pos, 0;
+  $/ = "\n";
+  $s = <$fh>.<$fh>;
+  ok($s eq "\nxxy\n");
+ }
+
  ok(close(FOO));
 }
 else {
  skip_all("No perlio, so no :crlf");
 }
 
-
+sub count_chars {
+  my($text, $chars) = @_;
+  my $seen = 0;
+  $seen++ while $text =~ /$chars/g;
+  return $seen;
+}