diff options
author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-31 21:42:12 +0000 |
---|---|---|
committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-31 21:42:12 +0000 |
commit | d5201bd266fe42b2df8b480183c08be291a1ad06 (patch) | |
tree | e7f719e75b91b93f6b813831b273f6d3dca6c15e /lib/lib.t | |
parent | 83943eac2433a9cd52f114532df2a61529f109a2 (diff) | |
download | perl-d5201bd266fe42b2df8b480183c08be291a1ad06.tar.gz |
Integrate macperl patches #16926 and #16938;
Big MacPerl Testing Patch No. 2
Big MacPerl Testing Patch No. 3
p4raw-id: //depot/perl@16942
p4raw-integrated: from //depot/macperl@16937 'copy in'
lib/Devel/SelfStubber.pm lib/Devel/SelfStubber.t
lib/File/DosGlob.t lib/File/Path.t lib/File/Spec/t/Spec.t
lib/File/Temp.pm lib/FindBin.t lib/Tie/File/t/09_gen_rs.t
lib/lib.t t/comp/use.t utils/dprofpp.PL utils/splain.PL
(@16123..) t/lib/MakeMaker/Test/Utils.pm (@16230..)
lib/diagnostics.t (@16646..) lib/ExtUtils/t/00setup_dummy.t
lib/ExtUtils/t/Command.t (@16730..) lib/lib_pm.PL (@16926..)
lib/ExtUtils/MM_MacOS.pm lib/Test/Harness/Straps.pm
lib/Test/Harness/t/callback.t
lib/Test/Harness/t/strap-analyze.t
lib/Test/Harness/t/test-harness.t (@16929..)
p4raw-integrated: from //depot/macperl@16926 'merge in' lib/English.t
(@16123..) ext/DynaLoader/DynaLoader_pm.PL (@16868..)
Diffstat (limited to 'lib/lib.t')
-rw-r--r-- | lib/lib.t | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -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()' ); |