Change 16875: Fixes for fixes

[email protected] (Chris Nandor) Thu, 30 May 2002 09:05:52 -0400
Newsgroups perl.perl5.changes.mac
Message-ID <p05100307b91bd4251b57@[10.0.1.177]>
Change 16875 by pudge@pudge-mobile on 2002/05/30 11:48:05

	Fixes for fixes

Affected files ...

.... //depot/macperl/ext/Cwd/t/cwd.t#5 edit
.... //depot/macperl/ext/Digest/MD5/t/files.t#5 edit
.... //depot/macperl/lib/blib.t#3 edit
.... //depot/macperl/t/lib/warnings/op#4 edit

Differences ...

==== //depot/macperl/ext/Cwd/t/cwd.t#5 (text) ====
Index: macperl/ext/Cwd/t/cwd.t
--- macperl/ext/Cwd/t/cwd.t#4~16868~	Wed May 29 22:39:51 2002
+++ macperl/ext/Cwd/t/cwd.t	Thu May 30 04:48:05 2002
@@ -128,7 +128,7 @@
 
     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$|);

==== //depot/macperl/ext/Digest/MD5/t/files.t#5 (text) ====
Index: macperl/ext/Digest/MD5/t/files.t
--- macperl/ext/Digest/MD5/t/files.t#4~16868~	Wed May 29 22:39:51 2002
+++ macperl/ext/Digest/MD5/t/files.t	Thu May 30 04:48:05 2002
@@ -30,7 +30,7 @@
 4850753428db9422e8e5f97b401d5a13  MD5.xs
 276da0aa4e9a08b7fe09430c9c5690aa  rfc1321.txt
 EOT
-} elsif ("\n" == "\015") { # MacOS
+} elsif ("\n" eq "\015") { # MacOS
     $EXPECT = <<EOT;
 cc90a85f89b397341f97c9279640fbf5  Changes
 127952946201e6afc19eb41250c56871  README

==== //depot/macperl/lib/blib.t#3 (text) ====
Index: macperl/lib/blib.t
--- macperl/lib/blib.t#2~16868~	Wed May 29 22:39:51 2002
+++ macperl/lib/blib.t	Thu May 30 04:48:05 2002
@@ -24,6 +24,7 @@
 BEGIN {
     if ($^O eq 'MacOS')
     {
+	$MacPerl::Architecture = $MacPerl::Architecture; # shhhhh
 	$blib = ":blib:";
 	$blib_lib = ":blib:lib:";
 	$blib_arch = ":blib:lib:$MacPerl::Architecture:";

==== //depot/macperl/t/lib/warnings/op#4 (text) ====
Index: macperl/t/lib/warnings/op
--- macperl/t/lib/warnings/op#3~16868~	Wed May 29 22:39:51 2002
+++ macperl/t/lib/warnings/op	Thu May 30 04:48:05 2002
@@ -822,7 +822,7 @@
 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
End of Patch.