X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flib.t;h=145d0072178a1ffd43407bd1d30f03f91893339c;hb=a65cb92d1f93e8343c90e37bd9d70f91efe34546;hp=9a86ac7424dba8865b18fb91180ef39a4e574ce2;hpb=e7bf5e490c5477fd9e68987efa76ba1bae48429c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/lib.t b/lib/lib.t index 9a86ac7..145d007 100644 --- a/lib/lib.t +++ b/lib/lib.t @@ -2,11 +2,11 @@ BEGIN { chdir 't'; - @INC = '../lib'; + unshift @INC, '../lib'; @OrigINC = @INC; } -use Test::More tests => 12; +use Test::More tests => 13; use Config; use File::Spec; use File::Path; @@ -51,13 +51,25 @@ use lib $Lib_Dir; BEGIN { use_ok('Yup') } BEGIN { + if ($^O eq 'MacOS') { + for ($Lib_Dir, $Arch_Dir) { + tr|/|:|; + $_ .= ":" unless /:$/; + $_ = ":$_" unless /^:/; # we know this path is relative + } + } is( $INC[1], $Lib_Dir, 'lib adding at end of @INC' ); print "# \@INC == @INC\n"; is( $INC[0], $Arch_Dir, ' auto/ dir in front of that' ); is( grep(/^\Q$Lib_Dir\E$/, @INC), 1, ' no duplicates' ); # Yes, %INC uses Unixy filepaths. - is( $INC{'Yup.pm'}, join("/",$Lib_Dir, 'Yup.pm'), '%INC set properly' ); + # Not on Mac OS, it doesn't ... it never has, at least. + my $path = join("/",$Lib_Dir, 'Yup.pm'); + if ($^O eq 'MacOS') { + $path = $Lib_Dir . 'Yup.pm'; + } + is( $INC{'Yup.pm'}, $path, '%INC set properly' ); is( eval { do 'Yup.pm' }, 42, 'do() works' ); ok( eval { require Yup; }, ' require()' ); @@ -69,6 +81,9 @@ BEGIN { no lib $Lib_Dir; +unlike( do { eval 'use lib $Config{installsitelib};'; $@ || '' }, + qr/::Config is read-only/, 'lib handles readonly stuff' ); + BEGIN { is( grep(/stuff/, @INC), 0, 'no lib' ); ok( !do 'Yup.pm', ' do() effected' );