Integrate macperl change #16875.

p4raw-link: @16875 on //depot/macperl: 7e4b169a9e787608dff5f2144628b527da9c3589

p4raw-id: //depot/perl@16883
p4raw-integrated: from //depot/macperl@16882 'copy in' ext/Cwd/t/cwd.t
	lib/blib.t t/lib/warnings/op (@16868..) 'ignore'
	ext/Digest/MD5/t/files.t (@16868..)

diff --git a/ext/Cwd/t/cwd.t b/ext/Cwd/t/cwd.t
index 0a43c91..e035d28 100644 (file)
--- a/ext/Cwd/t/cwd.t
+++ b/ext/Cwd/t/cwd.t
@@ -128,7 +128,7 @@ SKIP: {
 
     my $abs_path      =  Cwd::abs_path("linktest");
     my $fast_abs_path =  Cwd::fast_abs_path("linktest");
-    my $want          =  File::Spec->catdir("t", $Test_Dir) if $IsMacOS;
+    my $want          =  File::Spec->catdir("t", $Test_Dir);
 
     like($abs_path,      qr|$want$|);
     like($fast_abs_path, qr|$want$|);

diff --git a/ext/Digest/MD5/t/files.t b/ext/Digest/MD5/t/files.t
index 0e89dcb..783df41 100644 (file)
--- a/ext/Digest/MD5/t/files.t
+++ b/ext/Digest/MD5/t/files.t
@@ -30,7 +30,7 @@ b362148b17a451f0d81e0ebb2487756e  Changes
 4850753428db9422e8e5f97b401d5a13  MD5.xs
 276da0aa4e9a08b7fe09430c9c5690aa  rfc1321.txt
 EOT
-} elsif ("\n" == "\015") { # MacOS
+} elsif (ord "\n" == "\015") { # MacOS
     $EXPECT = <<EOT;
 cc90a85f89b397341f97c9279640fbf5  Changes
 127952946201e6afc19eb41250c56871  README

diff --git a/lib/blib.t b/lib/blib.t
index 6828f8b..4871f91 100644 (file)
--- a/lib/blib.t
+++ b/lib/blib.t
@@ -24,6 +24,7 @@ sub _mkdirs {
 BEGIN {
     if ($^O eq 'MacOS')
     {
+       $MacPerl::Architecture = $MacPerl::Architecture; # shhhhh
        $blib = ":blib:";
        $blib_lib = ":blib:lib:";
        $blib_arch = ":blib:lib:$MacPerl::Architecture:";

diff --git a/t/lib/warnings/op b/t/lib/warnings/op
index 16e1fd9..011fd17 100644 (file)
--- a/t/lib/warnings/op
+++ b/t/lib/warnings/op
@@ -822,7 +822,7 @@ use warnings 'syntax' ;
 exec "$^X -e 1" ; 
 my $a
 EXPECT
-Statement unlikely to be reached at - line 4.
+Statement unlikely to be reached at - line 13.
        (Maybe you meant system() when you said exec()?)
 ########
 # op.c