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, 17 insertions, 6 deletions

diff --git a/ext/Cwd/t/cwd.t b/ext/Cwd/t/cwd.t
index 6b0453d9e2..0a43c91a95 100644
--- a/ext/Cwd/t/cwd.t
+++ b/ext/Cwd/t/cwd.t
@@ -9,11 +9,13 @@ use Config;
 use Cwd;
 use strict;
 use warnings;
+use File::Spec;
 use File::Path;
 
 use Test::More tests => 16;
 
 my $IsVMS = $^O eq 'VMS';
+my $IsMacOS = $^O eq 'MacOS';
 
 # check imports
 can_ok('main', qw(cwd getcwd fastcwd fastgetcwd));
@@ -32,6 +34,8 @@ my $pwd = $^O eq 'MSWin32' ? "cmd" : "pwd";
 my $pwd_cmd =
     ($^O eq "NetWare") ?
         "cd" :
+    ($IsMacOS) ?
+        "pwd" :
         (grep { -x && -f } map { "$_/$pwd$Config{exe_ext}" }
 	                   split m/$Config{path_sep}/, $ENV{PATH})[0];
 
@@ -77,6 +81,9 @@ if( $IsVMS ) {
     $want =~ s|/|\.|g;
     $want .= '\]';
     $want = '((?i)' . $want . ')';  # might be ODS-2 or ODS-5
+} elsif ( $IsMacOS ) {
+    $_ = ":$_" for ($Top_Test_Dir, $Test_Dir);
+    s|/|:|g, s|$|:| for ($want, $Test_Dir);
 }
 
 mkpath(["$Test_Dir"], 0, 0777);
@@ -89,15 +96,16 @@ like(fastgetcwd(), qr|$want$|, '        + fastgetcwd()');
 
 # Cwd::chdir should also update $ENV{PWD}
 like($ENV{PWD}, qr|$want$|,      'Cwd::chdir() updates $ENV{PWD}');
-Cwd::chdir "..";
+my $updir = File::Spec->updir;
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
-Cwd::chdir "..";
+Cwd::chdir $updir;
 print "#$ENV{PWD}\n";
 
 rmtree([$Top_Test_Dir], 0, 0);
@@ -105,6 +113,9 @@ rmtree([$Top_Test_Dir], 0, 0);
 if ($IsVMS) {
     like($ENV{PWD}, qr|\b((?i)t)\]$|);
 }
+elsif ($IsMacOS) {
+    like($ENV{PWD}, qr|\bt:$|);
+}
 else {
     like($ENV{PWD}, qr|\bt$|);
 }
@@ -117,7 +128,7 @@ SKIP: {
 
     my $abs_path      =  Cwd::abs_path("linktest");
     my $fast_abs_path =  Cwd::fast_abs_path("linktest");
-    my $want          = "t/$Test_Dir";
+    my $want          =  File::Spec->catdir("t", $Test_Dir) if $IsMacOS;
 
     like($abs_path,      qr|$want$|);
     like($fast_abs_path, qr|$want$|);