Integrate mainline

[p5sagit/p5-mst-13.2.git] / t / op / magic.t

diff --git a/t/op/magic.t b/t/op/magic.t
index 61654aa..436e253 100755 (executable)
--- a/t/op/magic.t
+++ b/t/op/magic.t
@@ -134,10 +134,15 @@ ok((keys %h)[0] eq "foo\034bar", (keys %h)[0]);
 }
 
 # $?, $@, $$
-system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(0)"];
-ok $? == 0, $?;
-system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(1)"];
-ok $? != 0, $?;
+if ($Is_MacOS) {
+    skip('$? + system are broken on MacPerl') for 1..2;
+}
+else {
+    system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(0)"];
+    ok $? == 0, $?;
+    system qq[$PERL "-I../lib" -e "use vmsish qw(hushed); exit(1)"];
+    ok $? != 0, $?;
+}
 
 eval { die "foo\n" };
 ok $@ eq "foo\n", $@;
@@ -305,10 +310,7 @@ ok ${^TAINT} == 0;
 # 5.6.1 had a bug: @+ and @- were not properly interpolated
 # into double-quoted strings
 # 20020414 mjd-perl-patch+@plover.com
-{
-    no warnings 'ambiguous';
-    "I like pie" =~ /(I) (like) (pie)/;
-    ok "@-" eq  "0 0 2 7";
-    ok "@+" eq "10 1 6 10";
-}
+"I like pie" =~ /(I) (like) (pie)/;
+ok "@-" eq  "0 0 2 7";
+ok "@+" eq "10 1 6 10";