diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-09-08 08:41:38 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-09-08 11:27:21 +0200 |
| commit | 7b903762ad0ebd5d0459692ad5c081c69a3c0808 (patch) | |
| tree | 6e64cf76feca7527bf3a0b2ab962572023e5887e /lib/blib.t | |
| parent | a34ce875bf70f00f7af4a549f8c1ff0f4469f7fb (diff) | |
| download | perl-7b903762ad0ebd5d0459692ad5c081c69a3c0808.tar.gz | |
Remove code specific to MacOS Classic from core tests
Diffstat (limited to 'lib/blib.t')
| -rw-r--r-- | lib/blib.t | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/lib/blib.t b/lib/blib.t index a959471cbf..2ad9827d77 100644 --- a/lib/blib.t +++ b/lib/blib.t @@ -29,7 +29,7 @@ if ($Is_VMS) { sub _cleanup { rmdir foreach reverse (@_); - unlink "stderr" unless $^O eq 'MacOS'; + unlink "stderr"; } sub _mkdirs { @@ -41,21 +41,10 @@ sub _mkdirs { BEGIN { - if ($^O eq 'MacOS') - { - $MacPerl::Architecture = $MacPerl::Architecture; # shhhhh - $blib = ":blib:"; - $blib_lib = ":blib:lib:"; - $blib_arch = ":blib:lib:$MacPerl::Architecture:"; - @blib_dirs = ($blib, $blib_lib, $blib_arch); # order - } - else - { - $blib = "blib"; - $blib_arch = "blib/arch"; - $blib_lib = "blib/lib"; - @blib_dirs = ($blib, $blib_arch, $blib_lib); - } + $blib = "blib"; + $blib_arch = "blib/arch"; + $blib_lib = "blib/lib"; + @blib_dirs = ($blib, $blib_arch, $blib_lib); _cleanup( @blib_dirs ); } @@ -82,7 +71,7 @@ if ($Is_VMS_mode) { $blib_arch = 'blib.arch]'; $blib_lib = 'blib.lib]'; } -elsif ($^O ne 'MacOS') +else { $blib_arch = File::Spec->catdir("blib","arch"); $blib_lib = File::Spec->catdir("blib","lib"); |