From d5201bd266fe42b2df8b480183c08be291a1ad06 Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 31 May 2002 21:42:12 +0000
Subject: 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..)
---
 t/comp/use.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 't/comp')

diff --git a/t/comp/use.t b/t/comp/use.t
index e0281b4d20..8e9eb8b1a8 100755
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -82,7 +82,7 @@ if ($@) {
 }
 print "ok ",$i++,"\n";
 
-print "not " unless $INC[0] eq "fred";
+print "not " unless ($INC[0] eq "fred" || ($^O eq 'MacOS' && $INC[0] eq ":fred:"));
 print "ok ",$i++,"\n";
 
 eval "use lib 1.0 qw(joe)";
@@ -92,7 +92,7 @@ if ($@) {
 }
 print "ok ",$i++,"\n";
 
-print "not " unless $INC[0] eq "joe";
+print "not " unless ($INC[0] eq "joe" || ($^O eq 'MacOS' && $INC[0] eq ":joe:"));
 print "ok ",$i++,"\n";
 
 eval "use lib 1.01 qw(freda)";
@@ -101,7 +101,7 @@ unless ($@) {
 }
 print "ok ",$i++,"\n";
 
-print "not " if $INC[0] eq "freda";
+print "not " if ($INC[0] eq "freda" || ($^O eq 'MacOS' && $INC[0] eq ":freda:"));
 print "ok ",$i++,"\n";
 
 {
-- 
cgit v1.2.1