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..)

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/lib.t b/lib/lib.t
index 9a86ac7424..41280eee39 100644
--- a/lib/lib.t
+++ b/lib/lib.t
@@ -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()' );