Protect run_perl() tests against old relocated perls

diff --git a/t/41-threads-teardown.t b/t/41-threads-teardown.t
index a4a005f6370a62bf9791dcf5bb2ed5ab131f34d9..6794151a9153b904d2ef83eef5ac5725e660ffdc 100644 (file)
--- a/t/41-threads-teardown.t
+++ b/t/41-threads-teardown.t
@@ -12,8 +12,9 @@ use VPIT::TestHelpers (
 
 use Test::Leaner tests => 3;
 
-SKIP:
-{
+my $run_perl_failed = 'Could not execute perl subprocess';
+
+SKIP: {
  skip 'Fails on 5.8.2 and lower' => 1 if "$]" <= 5.008_002;
 
  my $status = run_perl <<' RUN';
@@ -32,10 +33,12 @@ SKIP:
   eval q{return; no indirect hook => \&cb; new Z;};
   exit $code;
  RUN
- is $status, 0, 'loading the pragma in a thread and using it outside doesn\'t segfault';
+ skip $run_perl_failed => 1 unless defined $status;
+ is $status, 0,
+        'loading the pragma in a thread and using it outside doesn\'t segfault';
 }
 
-{
+SKIP: {
  my $status = run_perl <<' RUN';
   use threads;
   BEGIN { require indirect; }
@@ -47,10 +50,11 @@ SKIP:
   })->join;
   exit $code;
  RUN
+ skip $run_perl_failed => 1 unless defined $status;
  is $status, 0, 'indirect can be loaded in eval STRING during global destruction at the end of a thread';
 }
 
-{
+SKIP: {
  my $status = run_perl <<' RUN';
   use threads;
   use threads::shared;
@@ -65,5 +69,6 @@ SKIP:
   })->join;
   exit $code;
  RUN
+ skip $run_perl_failed => 1 unless defined $status;
  is $status, 0, 'indirect does not check eval STRING during global destruction at the end of a thread';
 }

diff --git a/t/50-external.t b/t/50-external.t
index e9c828b0629b47d0562c50825845d0b7ec089f0d..b98a18fb96425d75495605ef1ce8a011fba5f009 100644 (file)
--- a/t/50-external.t
+++ b/t/50-external.t
@@ -12,34 +12,40 @@ use VPIT::TestHelpers;
 
 BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
-{
+my $run_perl_failed = 'Could not execute perl subprocess';
+
+SKIP: {
  my $status = run_perl 'no indirect; qq{a\x{100}b} =~ /\A[\x00-\x7f]*\z/;';
+ skip $run_perl_failed => 1 unless defined $status;
  is $status, 0, 'RT #47866';
 }
 
-SKIP:
-{
+SKIP: {
  skip 'Fixed in core only since 5.12' => 1 unless "$]" >= 5.012;
+
  my $status = run_perl 'no indirect hook => sub { exit 2 }; new X';
+ skip $run_perl_failed => 1 unless defined $status;
  is $status, 2 << 8, 'no semicolon at the end of -e';
 }
 
-SKIP:
-{
+SKIP: {
  load_or_skip('Devel::CallParser', undef, undef, 1);
+
  my $status = run_perl "use Devel::CallParser (); no indirect; sub ok { } ok 1";
+ skip $run_perl_failed => 1 unless defined $status;
  is $status, 0, 'indirect is not getting upset by Devel::CallParser';
 }
 
-SKIP:
-{
+SKIP: {
  my $has_package_empty = do {
   local $@;
   eval 'no warnings "deprecated"; package; 1'
  };
  skip 'Empty package only available on perl 5.8.x and below' => 1
                                                       unless $has_package_empty;
+
  my $status = run_perl 'no indirect hook => sub { }; exit 0; package; new X;';
+ skip $run_perl_failed => 1 unless defined $status;
  is $status, 0, 'indirect does not croak while package empty is in use';
 }
 
@@ -48,8 +54,7 @@ if ($Config::Config{d_fork} or $Config::Config{d_pseudofork}) {
  $fork_status = run_perl 'my $pid = fork; exit 1 unless defined $pid; if ($pid) { waitpid $pid, 0; my $status = $?; exit(($status >> 8) || $status) } else { exit 0 }';
 }
 
-SKIP:
-{
+SKIP: {
  my $tests = 2;
  skip 'fork() or pseudo-forks are required to check END blocks in subprocesses'
                                           => $tests unless defined $fork_status;
@@ -57,8 +62,10 @@ SKIP:
                                           => $tests unless $fork_status == 0;
 
  my $status = run_perl 'require indirect; END { eval q[1] } my $pid = fork; exit 0 unless defined $pid; if ($pid) { waitpid $pid, 0; my $status = $?; exit(($status >> 8) || $status) } else { exit 0 }';
+ skip $run_perl_failed => $tests unless defined $status;
  is $status, 0, 'indirect and global END blocks executed at the end of a forked process (RT #99083)';
 
  $status = run_perl 'require indirect; my $pid = fork; exit 0 unless defined $pid; if ($pid) { waitpid $pid, 0; my $status = $?; exit(($status >> 8) || $status) } else { eval q[END { eval q(1) }]; exit 0 }';
+ skip $run_perl_failed => ($tests - 1) unless defined $status;
  is $status, 0, 'indirect and local END blocks executed at the end of a forked process';
 }