Integrate macperl patch #16868.

p4raw-id: //depot/perl@16882
p4raw-integrated: from //depot/macperl@16881 'copy in'
	ext/B/B/Concise.pm ext/B/t/deparse.t ext/B/t/terse.t
	ext/DynaLoader/DynaLoader_pm.PL ext/IO/lib/IO/t/io_dup.t
	ext/POSIX/t/sigaction.t ext/PerlIO/t/encoding.t
	ext/Socket/Socket.t lib/AutoSplit.t
	lib/Net/Ping/t/110_icmp_inst.t lib/Net/hostent.t
	lib/Pod/t/Usage.t lib/Pod/t/pod2html-lib.pl
	lib/Test/Harness/t/callback.t lib/blib.pm lib/strict.t
	lib/subs.t t/lib/filter-util.pl t/lib/warnings/doio
	t/lib/warnings/mg t/x2p/s2p.t (@16123..)
	lib/Test/Simple/t/exit.t (@16230..) lib/open.t lib/warnings.t
	(@16255..) perl.c (@16475..) lib/Unicode/Collate.pm
	lib/Unicode/UCD.t (@16651..) ext/PerlIO/t/fallback.t
	lib/Test/Harness/t/strap-analyze.t
	lib/Test/Harness/t/test-harness.t (@16825..)
p4raw-integrated: from //depot/macperl@16868 'copy in' lib/blib.t
	(@16123..) t/lib/warnings/op (@16230..) ext/Cwd/t/cwd.t
	ext/Digest/MD5/t/files.t (@16475..) 'merge in'
	ext/Storable/t/utf8hash.t lib/Test/Harness/Straps.pm (@16730..)

1 files changed, 24 insertions, 7 deletions

diff --git a/lib/blib.t b/lib/blib.t
index bb269c443f..6828f8b247 100644
--- a/lib/blib.t
+++ b/lib/blib.t
@@ -6,10 +6,11 @@ BEGIN {
 }
 
 use strict;
+my($blib, $blib_arch, $blib_lib, @blib_dirs);
 
 sub _cleanup {
-    rmdir foreach reverse qw(blib blib/arch blib/lib);
-    unlink "stderr";
+    rmdir foreach reverse (@_);
+    unlink "stderr" unless $^O eq 'MacOS';
 }
 
 sub _mkdirs {
@@ -20,14 +21,30 @@ sub _mkdirs {
 }
     
 
-BEGIN { _cleanup }
+BEGIN {
+    if ($^O eq 'MacOS')
+    {
+	$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);
+    }
+    _cleanup( @blib_dirs );
+}
 
 use Test::More tests => 7;
 
 eval 'use blib;';
 ok( $@ =~ /Cannot find blib/, 'Fails if blib directory not found' );
 
-_mkdirs(qw(blib blib/arch blib/lib));
+_mkdirs( @blib_dirs );
 
 {
     my $warnings = '';
@@ -39,7 +56,7 @@ _mkdirs(qw(blib blib/arch blib/lib));
 is( @INC, 3, '@INC now has 3 elements' );
 is( $INC[2],    '../lib',       'blib added to the front of @INC' );
 
-ok( grep(m|blib/lib$|, @INC[0,1])  == 1,     '  blib/lib in @INC');
-ok( grep(m|blib/arch$|, @INC[0,1]) == 1,     '  blib/arch in @INC');
+ok( grep(m|$blib_lib$|, @INC[0,1])  == 1,     '  blib/lib in @INC');
+ok( grep(m|$blib_arch$|, @INC[0,1]) == 1,     '  blib/arch in @INC');
 
-END { _cleanup(); }
+END { _cleanup( @blib_dirs ); }