Fix Safe tests under PERL_CORE and make safeops.t run again

diff --git a/ext/Safe/t/safeops.t b/ext/Safe/t/safeops.t
index ee83ac8..bd8217d 100644 (file)
--- a/ext/Safe/t/safeops.t
+++ b/ext/Safe/t/safeops.t
@@ -2,11 +2,7 @@
 # Tests that all ops can be trapped by a Safe compartment
 
 BEGIN {
-    if ($ENV{PERL_CORE}) {
-       chdir 't' if -d 't';
-       @INC = '../lib';
-    }
-    else {
+    unless ($ENV{PERL_CORE}) {
        # this won't work outside of the core, so exit
         print "1..0 # skipped: PERL_CORE unset\n"; exit 0;
     }
@@ -32,7 +28,7 @@ while (<DATA>) {
     $code{$1} = $2;
 }
 
-open my $fh, '<', '../opcode.pl' or die "Can't open opcode.pl: $!";
+open my $fh, '<', '../../opcode.pl' or die "Can't open opcode.pl: $!";
 while (<$fh>) {
     last if /^__END__/;
 }

diff --git a/t/TEST b/t/TEST
index fdf3d05..a0a004e 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -34,7 +34,6 @@ my %temp_no_core =
      '../ext/IO-Compress' => 1,
      '../ext/IPC-SysV' => 1,
      '../ext/MIME-Base64' => 1,
-     '../ext/Safe' => 'fixme',
      '../ext/Time-HiRes' => 1,
      '../ext/Unicode-Normalize' => 1,
     );