X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fio%2Flayers.t;h=c399b2ad8f5ad05d285803248d0adf4467c7d743;hb=584420f022db57225e9644b9c6668ff9f567984a;hp=8f7039243461b04c7c138811747fbbd741fc9300;hpb=f0fd62e239deb6bdb9f12a7e8ad137e5e1083e2a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/io/layers.t b/t/io/layers.t
index 8f70392..c399b2a 100644
--- a/t/io/layers.t
+++ b/t/io/layers.t
@@ -10,6 +10,11 @@ BEGIN {
 	print "1..0 # Skip: not perlio\n";
 	exit 0;
     }
+    eval 'use Encode';
+    if ($@ =~ /dynamic loading not available/) {
+        print "1..0 # miniperl cannot load Encode\n";
+	exit 0;
+    }
     # Makes testing easier.
     $ENV{PERLIO} = 'stdio' if exists $ENV{PERLIO} && $ENV{PERLIO} eq '';
     if (exists $ENV{PERLIO} && $ENV{PERLIO} !~ /^(stdio|perlio|mmap)$/) {
@@ -20,24 +25,46 @@ BEGIN {
     $PERLIO = exists $ENV{PERLIO} ? $ENV{PERLIO} : "(undef)";
 }
 
-plan tests => 43;
-
 use Config;
 
-my $DOSISH    = $^O =~ /^(?:MSWin32|cygwin|os2|dos|NetWare|mint)$/ ? 1 : 0;
+my $DOSISH    = $^O =~ /^(?:MSWin32|os2|dos|NetWare|mint)$/ ? 1 : 0;
+   $DOSISH    = 1 if !$DOSISH and $^O =~ /^uwin/;
 my $NONSTDIO  = exists $ENV{PERLIO} && $ENV{PERLIO} ne 'stdio'     ? 1 : 0;
 my $FASTSTDIO = $Config{d_faststdio} && $Config{usefaststdio}      ? 1 : 0;
+my $UTF8_STDIN;
+if (${^UNICODE} & 1) {
+    if (${^UNICODE} & 64) {
+	# Conditional on the locale
+	$UTF8_STDIN = ${^UTF8LOCALE};
+    } else {
+	# Unconditional
+	$UTF8_STDIN = 1;
+    }
+} else {
+    $UTF8_STDIN = 0;
+}
+my $NTEST = 44 - (($DOSISH || !$FASTSTDIO) ? 7 : 0) - ($DOSISH ? 5 : 0)
+    + $UTF8_STDIN;
+
+sub PerlIO::F_UTF8 () { 0x00008000 } # from perliol.h
+
+plan tests => $NTEST;
 
 print <<__EOH__;
-# PERLIO    = $PERLIO
-# DOSISH    = $DOSISH
-# NONSTDIO  = $NONSTDIO
-# FASTSTDIO = $FASTSTDIO
+# PERLIO        = $PERLIO
+# DOSISH        = $DOSISH
+# NONSTDIO      = $NONSTDIO
+# FASTSTDIO     = $FASTSTDIO
+# UNICODE       = ${^UNICODE}
+# UTF8LOCALE    = ${^UTF8LOCALE}
+# UTF8_STDIN = $UTF8_STDIN
 __EOH__
 
 SKIP: {
-    skip("This perl does not have Encode", 43)
+    # FIXME - more of these could be tested without Encode or full perl
+    skip("This perl does not have Encode", $NTEST)
 	unless " $Config{extensions} " =~ / Encode /;
+    skip("miniperl does not have Encode", $NTEST) if $ENV{PERL_CORE_MINITEST};
 
     sub check {
 	my ($result, $expected, $id) = @_;
@@ -74,8 +101,14 @@ SKIP: {
 		   $result->[0] eq "unix" &&
 		   $result->[1] eq "crlf";
 	}
+	if ($DOSISH && grep { $_ eq 'crlf' } @$expected) {
+	    # 5 tests potentially skipped because
+	    # DOSISH systems already have a CRLF layer
+	    # which will make new ones not stick.
+	    @$expected = grep { $_ ne 'crlf' } @$expected;
+	}
 	my $n = scalar @$expected;
-	is($n, scalar @$expected, "$id - layers = $n");
+	is(scalar @$result, $n, "$id - layers == $n");
 	for (my $i = 0; $i < $n; $i++) {
 	    my $j = $expected->[$i];
 	    if (ref $j eq 'CODE') {
@@ -89,7 +122,7 @@ SKIP: {
     }
 
     check([ PerlIO::get_layers(STDIN) ],
-	  [ "stdio" ],
+	  $UTF8_STDIN ? [ "stdio", "utf8" ] : [ "stdio" ],
 	  "STDIN");
 
     open(F, ">:crlf", "afile");
@@ -116,7 +149,6 @@ SKIP: {
 	  [ "stdio" ],
 	  ":raw");
 
-    binmode(F, ":pop") if $DOSISH; # Drop one extra :crlf.
     binmode(F, ":utf8");
 
     check([ PerlIO::get_layers(F) ],
@@ -143,9 +175,8 @@ SKIP: {
 
     binmode(F, ":raw :encoding(latin1)"); # "latin1" will be canonized
 
-    SKIP: {
-	skip("too complex layer coreography", 7) if $DOSISH || !$FASTSTDIO;
-
+    # 7 tests potentially skipped.
+    unless ($DOSISH || !$FASTSTDIO) {
 	my @results = PerlIO::get_layers(F, details => 1);
 
 	# Get rid of the args and the flags.
@@ -183,5 +214,12 @@ SKIP: {
 	close G;
     }
 
+    # Check that PL_sigwarn's reference count is correct, and that 
+    # &PerlIO::Layer::NoWarnings isn't prematurely freed.
+    fresh_perl_like (<<'EOT', qr/^CODE/);
+open(UTF, "<:raw:encoding(utf8)", "afile") or die $!;
+print ref *PerlIO::Layer::NoWarnings{CODE};
+EOT
+
     1 while unlink "afile";
 }