The value from caller doesn't change, so my $pkg = caller;

[perl5.git] / lib / open.t

diff --git a/lib/open.t b/lib/open.t
index 5897c2b..554798b 100644 (file)
--- 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 => 15;
+use Test::More tests => 16;
 
 # open::import expects 'open' as its first argument, but it clashes with open()
 sub import {
@@ -18,11 +19,11 @@ 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
@@ -31,23 +32,23 @@ 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' );
 
-SKIP: {
-    skip("no perlio, no :utf8", 1) unless $Config{useperlio};
-    # 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' );
+
+# open :locale logic changed since open 1.04, new logic
+# difficult to test portably.
 
-# and see if it sets the magic variables appropriately
+# 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' );
 
@@ -57,16 +58,16 @@ 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';
@@ -164,6 +165,16 @@ EOE
        "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";