MacOS fixups for new lib/h2xs.t

Message-ID: <Pine.BSF.4.21.0106231105380.25634-100000@shell8.ba.best.com>

p4raw-id: //depot/perl@10869

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/h2xs.t b/lib/h2xs.t
index d4c03d9471..8935711ddd 100644
--- a/lib/h2xs.t
+++ b/lib/h2xs.t
@@ -11,12 +11,12 @@ BEGIN {
     @INC = '../lib';
 }
 
-use strict;
+# use strict; # we are not really testing this
 use File::Path;  # for cleaning up with rmtree()
 
 my $extracted_program = '../utils/h2xs'; # unix, nt, ...
 if ($^O eq 'VMS') { $extracted_program = '[-.utils]h2xs.com'; }
-if ($^O eq 'MacOS') { $extracted_program = ':::utils:h2xs'; }
+if ($^O eq 'MacOS') { $extracted_program = '::utils:h2xs'; }
 if (!(-e $extracted_program)) {
     print "1..0 # Skip: $extracted_program was not built\n";
     exit 0;
@@ -30,7 +30,7 @@ my $lib = '"-I../lib"'; # ok on unix, nt, The extra \" are for VMS
 # already merged).
 if ($^O eq 'MacOS') {
     $dupe = '';
-    $lib = '-I::lib:';
+    $lib = '-x -I::lib:'; # -x overcomes MPW $Config{startperl} anomaly
 }
 # $name should differ from system header file names and must
 # not already be found in the t/ subdirectory for perl.
@@ -73,7 +73,10 @@ my $t = 3;
 $expectation =~ s/Writing //; # remove leader
 foreach (split(/Writing /,$expectation)) {
     chomp;  # remove \n
-    if ($^O eq 'MacOS') { $_ = ':' . join(':',split(/\//,$_)); }
+    if ($^O eq 'MacOS') {
+        $_ = ':' . join(':',split(/\//,$_));
+        $_ =~ s/$name:t:1.t/$name:t\/1.t/; # is this an h2xs bug?
+    }
     print(((-e $_) ? "" : "not "), "ok $t\n");
     $t++;
 }
@@ -107,7 +110,10 @@ $t++;
 $expectation =~ s/Writing //; # remove leader
 foreach (split(/Writing /,$expectation)) {
     chomp;  # remove \n
-    if ($^O eq 'MacOS') { $_ = ':' . join(':',split(/\//,$_)); }
+    if ($^O eq 'MacOS') {
+        $_ = ':' . join(':',split(/\//,$_));
+        $_ =~ s/$name:t:1.t/$name:t\/1.t/; # is this an h2xs bug?
+    }
     print(((-e $_) ? "" : "not "), "ok $t\n");
     $t++;
 }