Integrate macperl patch #16868.

p4raw-id: //depot/perl@16882
p4raw-integrated: from //depot/macperl@16881 'copy in'
	ext/B/B/Concise.pm ext/B/t/deparse.t ext/B/t/terse.t
	ext/DynaLoader/DynaLoader_pm.PL ext/IO/lib/IO/t/io_dup.t
	ext/POSIX/t/sigaction.t ext/PerlIO/t/encoding.t
	ext/Socket/Socket.t lib/AutoSplit.t
	lib/Net/Ping/t/110_icmp_inst.t lib/Net/hostent.t
	lib/Pod/t/Usage.t lib/Pod/t/pod2html-lib.pl
	lib/Test/Harness/t/callback.t lib/blib.pm lib/strict.t
	lib/subs.t t/lib/filter-util.pl t/lib/warnings/doio
	t/lib/warnings/mg t/x2p/s2p.t (@16123..)
	lib/Test/Simple/t/exit.t (@16230..) lib/open.t lib/warnings.t
	(@16255..) perl.c (@16475..) lib/Unicode/Collate.pm
	lib/Unicode/UCD.t (@16651..) ext/PerlIO/t/fallback.t
	lib/Test/Harness/t/strap-analyze.t
	lib/Test/Harness/t/test-harness.t (@16825..)
p4raw-integrated: from //depot/macperl@16868 'copy in' lib/blib.t
	(@16123..) t/lib/warnings/op (@16230..) ext/Cwd/t/cwd.t
	ext/Digest/MD5/t/files.t (@16475..) 'merge in'
	ext/Storable/t/utf8hash.t lib/Test/Harness/Straps.pm (@16730..)

5 files changed, 56 insertions, 7 deletions

diff --git a/t/lib/filter-util.pl b/t/lib/filter-util.pl
index c378f221d7..1bc3bfbd93 100644
--- a/t/lib/filter-util.pl
+++ b/t/lib/filter-util.pl
@@ -45,6 +45,7 @@ sub ok
 $Inc = '' ;
 foreach (@INC)
  { $Inc .= "\"-I$_\" " }
+$Inc = "-I::lib" if $^O eq 'MacOS';
 
 $Perl = '' ;
 $Perl = ($ENV{'FULLPERL'} or $^X or 'perl') ;
diff --git a/t/lib/warnings/doio b/t/lib/warnings/doio
index 569229d35f..bb09aa8552 100644
--- a/t/lib/warnings/doio
+++ b/t/lib/warnings/doio
@@ -171,6 +171,15 @@ Use of -l on filehandle STDIN at - line 3.
 Use of -l on filehandle $fh at - line 6.
 ########
 # doio.c [Perl_do_aexec5]
+BEGIN {
+    if ($^O eq 'MacOS') {
+	print <<EOM;
+SKIPPED
+# no exec on Mac OS
+EOM
+	exit;
+    }
+}
 use warnings 'io' ;
 exec "lskdjfalksdjfdjfkls","" ;
 no warnings 'io' ;
@@ -180,6 +189,15 @@ OPTION regex
 Can't exec "lskdjfalksdjfdjfkls": .+
 ########
 # doio.c [Perl_do_exec3]
+BEGIN {
+    if ($^O eq 'MacOS') {
+	print <<EOM;
+SKIPPED
+# no exec on Mac OS
+EOM
+	exit;
+    }
+}
 use warnings 'io' ;
 exec "lskdjfalksdjfdjfkls", "abc" ;
 no warnings 'io' ;
@@ -189,6 +207,15 @@ OPTION regex
 Can't exec "lskdjfalksdjfdjfkls(:? abc)?": .+
 ########
 # doio.c [win32_execvp]
+BEGIN {
+    if ($^O eq 'MacOS') {
+	print <<EOM;
+SKIPPED
+# no exec on Mac OS
+EOM
+	exit;
+    }
+}
 use warnings 'exec' ;
 exec $^X, "-e0" ;
 EXPECT
diff --git a/t/lib/warnings/mg b/t/lib/warnings/mg
index 2190638dc2..f7c3ebf435 100644
--- a/t/lib/warnings/mg
+++ b/t/lib/warnings/mg
@@ -25,7 +25,7 @@ EXPECT
 ########
 # mg.c
 use warnings 'signal' ;
-if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') {
+if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS' || $^O eq 'MacOS') {
     print "SKIPPED\n# $^O, can't kill() to raise()\n"; exit;
 }
 $|=1;
@@ -35,8 +35,8 @@ SIGINT handler "fred" not defined.
 ########
 # mg.c
 no warnings 'signal' ;
-if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') {
-    print "SKIPPED\n# win32, can't kill() to raise()\n"; exit;
+if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS' || $^O eq 'MacOS') {
+    print "SKIPPED\n# $^O, can't kill() to raise()\n"; exit;
 }
 $|=1;
 $SIG{"INT"} = "fred"; kill "INT",$$;
diff --git a/t/lib/warnings/op b/t/lib/warnings/op
index 387e620efa..16e1fd9b05 100644
--- a/t/lib/warnings/op
+++ b/t/lib/warnings/op
@@ -809,6 +809,15 @@ EXPECT
 Hash %FRED missing the % in argument 1 of keys() at - line 3.
 ########
 # op.c
+BEGIN {
+    if ($^O eq 'MacOS') {
+	print <<EOM;
+SKIPPED
+# no exec on Mac OS
+EOM
+	exit;
+    }
+}
 use warnings 'syntax' ;
 exec "$^X -e 1" ; 
 my $a
@@ -838,6 +847,15 @@ defined(%hash) is deprecated at - line 3.
 	(Maybe you should just omit the defined()?)
 ########
 # op.c
+BEGIN {
+    if ($^O eq 'MacOS') {
+	print <<EOM;
+SKIPPED
+# no exec on Mac OS
+EOM
+	exit;
+    }
+}
 no warnings 'syntax' ;
 exec "$^X -e 1" ; 
 my $a
diff --git a/t/x2p/s2p.t b/t/x2p/s2p.t
index 50d2483f53..39c6cd8055 100755
--- a/t/x2p/s2p.t
+++ b/t/x2p/s2p.t
@@ -798,6 +798,9 @@ my $sedcmd = [ $psed, '-f', $script, $stdin ];
 my $s2pcmd = [ $s2p,  '-f', $script ];
 my $plcmd  = [ $plsed, $stdin ];
 
+my $switches = '';
+$switches = ['-x'] if $^O eq 'MacOS';
+
 # psed: we create a local copy as linking may not work on some systems.
 copy( $s2p, $psed );
 push( @aux, $psed );
@@ -841,19 +844,19 @@ for my $tc ( sort keys %testcase ){
 
     # run and compare
     #
-    $psedres = runperl( args => $sedcmd );
+    $psedres = runperl( args => $sedcmd, switches => $switches );
     is( $psedres, $testcase{$tc}{expect}, "psed $tc" );
 
     # 2nd test: run s2p
     # translate the sed script to a Perl program
-    
-    my $perlprog = runperl( args => $s2pcmd );
+
+    my $perlprog = runperl( args => $s2pcmd, switches => $switches );
     open( PP, ">$plsed" ) || goto FAIL_S2P;
     print PP $perlprog;
     close( PP ) || goto FAIL_S2P;
 
     # execute generated Perl program, compare
-    $s2pres = runperl( args => $plcmd );
+    $s2pres = runperl( args => $plcmd, switches => $switches );
     is( $s2pres, $testcase{$tc}{expect}, "s2p $tc" );
     next;