X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fopen.t;h=55b955bd0fc861d7f8502293d5a37cd212da24b3;hb=14be35aaf1e66d9ee3b0b434256386e605d6024d;hp=9f1a8607f266c71ddd311dfda7c878ab6cb6a951;hpb=820c63ad8280dd06f5dfe5b29e477790231a3db9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/open.t b/lib/open.t
index 9f1a860..55b955b 100644
--- a/lib/open.t
+++ b/lib/open.t
@@ -3,10 +3,11 @@
 BEGIN {
 	chdir 't' if -d 't';
 	@INC = '../lib';
+	push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
 	require Config; import Config;
 }
 
-use Test::More tests => 16;
+use Test::More tests => 17;
 
 # open::import expects 'open' as its first argument, but it clashes with open()
 sub import {
@@ -18,41 +19,43 @@ ok( require 'open.pm', 'requiring open' );
 
 # this should fail
 eval { import() };
-like( $@, qr/needs explicit list of disciplines/, 
+like( $@, qr/needs explicit list of PerlIO layers/,
 	'import should fail without args' );
 
 # the hint bits shouldn't be set yet
-is( $^H & $open::hint_bits, 0, 
+is( $^H & $open::hint_bits, 0,
 	'hint bits should not be set in $^H before open import' );
 
 # prevent it from loading I18N::Langinfo, so we can test encoding failures
-{
-    local @INC;
-    $ENV{LC_ALL} = $ENV{LANG} = '';
-    eval { import( 'IN', 'locale' ) };
-    like( $@, qr/Cannot figure out an encoding/, 
-	  'no encoding should be found without $ENV{LANG} or $ENV{LC_ALL}' );
-}
-
 my $warn;
 local $SIG{__WARN__} = sub {
 	$warn .= shift;
 };
 
-# and it shouldn't be able to find this discipline
-eval{ import( 'IN', 'macguffin' ) };
-like( $warn, qr/Unknown discipline layer/, 
-	'should warn about unknown discipline with bad discipline provided' );
+# and it shouldn't be able to find this layer
+$warn = '';
+eval q{ no warnings 'layer'; use open IN => ':macguffin' ; };
+is( $warn, '',
+	'should not warn about unknown layer with bad layer provided' );
 
-# now load a real-looking locale
-$ENV{LC_ALL} = ' .utf8';
-import( 'IN', 'locale' );
-is( ${^OPEN}, ":utf8\0", 
-	'should set a valid locale layer' );
+$warn = '';
+eval q{ use warnings 'layer'; use open IN => ':macguffin' ; };
+like( $warn, qr/Unknown PerlIO layer/,
+	'should warn about unknown layer with bad layer provided' );
+
+SKIP: {
+    skip("no perlio, no :utf8", 1) unless (find PerlIO::Layer 'perlio');
+    skip("no Encode for locale layer", 1) unless eval { require Encode }; 
+    # now load a real-looking locale
+    $ENV{LC_ALL} = ' .utf8';
+    import( 'IN', 'locale' );
+    like( ${^OPEN}, qr/^(:utf8)?:utf8\0/,
+        'should set a valid locale layer' );
+}
 
 # and see if it sets the magic variables appropriately
 import( 'IN', ':crlf' );
-ok( $^H & $open::hint_bits, 
+ok( $^H & $open::hint_bits,
 	'hint bits should be set in $^H after open import' );
 is( $^H{'open_IN'}, 'crlf', 'should have set crlf layer' );
 
@@ -62,17 +65,18 @@ is( $^H{'open_IN'}, 'raw', 'should have reset to raw layer' );
 
 # it dies if you don't set IN, OUT, or IO
 eval { import( 'sideways', ':raw' ) };
-like( $@, qr/Unknown discipline class/, 'should croak with unknown class' );
+like( $@, qr/Unknown PerlIO layer class/, 'should croak with unknown class' );
 
 # but it handles them all so well together
 import( 'IO', ':raw :crlf' );
 is( ${^OPEN}, ":raw :crlf\0:raw :crlf",
-	'should set multi types, multi disciplines' );
+	'should set multi types, multi layer' );
 is( $^H{'open_IO'}, 'crlf', 'should record last layer set in %^H' );
 
 SKIP: {
-    skip("no perlio, no :utf8", 4) unless $Config{'useperlio'};
+    skip("no perlio, no :utf8", 4) unless (find PerlIO::Layer 'perlio');
 
+    eval <<EOE;
     use open ':utf8';
     open(O, ">utf8");
     print O chr(0x100);
@@ -80,6 +84,7 @@ SKIP: {
     open(I, "<utf8");
     is(ord(<I>), 0x100, ":utf8 single wide character round-trip");
     close I;
+EOE
 
     open F, ">a";
     @a = map { chr(1 << ($_ << 2)) } 0..5; # 0x1, 0x10, .., 0x100000
@@ -167,6 +172,16 @@ SKIP: {
        "checking syswrite() output on :utf8 streams by reading it back in");
 }
 
+SKIP: {
+    skip("no perlio", 1) unless (find PerlIO::Layer 'perlio');
+    use open IN => ':non-existent';
+    eval {
+	require Symbol; # Anything that exists but we havn't loaded
+    };
+    like($@, qr/Can't locate Symbol|Recursive call/i,
+	 "test for an endless loop in PerlIO_find_layer");
+}
+
 END {
     1 while unlink "utf8";
     1 while unlink "a";
@@ -181,7 +196,7 @@ eval { open::_get_locale_encoding() };
 like( $@, qr/too ambiguous/, 'should die with ambiguous locale encoding' );
 %%%
 # the special :locale layer
-$ENV{LANG} = 'ru_RU.KOI8-R';
+$ENV{LC_ALL} = $ENV{LANG} = 'ru_RU.KOI8-R';
 # the :locale will probe the locale environment variables like LANG
 use open OUT => ':locale';
 open(O, ">koi8");