Upgrade Safe.pm to 2.09 after CPAN backport.

[p5sagit/p5-mst-13.2.git] / ext / Safe / safe2.t

diff --git a/ext/Safe/safe2.t b/ext/Safe/safe2.t
index 94398d4..3ea19ed 100755 (executable)
--- a/ext/Safe/safe2.t
+++ b/ext/Safe/safe2.t
@@ -1,8 +1,10 @@
 #!./perl -w
 $|=1;
 BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
+    if($ENV{PERL_CORE}) {
+       chdir 't' if -d 't';
+       @INC = '../lib';
+    } 
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') {
         print "1..0\n";
@@ -38,7 +40,7 @@ $cpt = new Safe or die;
 $cpt = new Safe "Root";
 
 $cpt->reval(q{ system("echo not ok 1"); });
-if ($@ =~ /^'system' trapped by operation mask/) {
+if ($@ =~ /^'?system'? trapped by operation mask/) {
     print "ok 1\n";
 } else {
     print "#$@" if $@;