X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F50-external.t;h=d34db9cf5a980ae7a095f489c1f336abb357320f;hp=e9c828b0629b47d0562c50825845d0b7ec089f0d;hb=b88a054e2ca91c186a420e015b3a383b406ff2d0;hpb=640ff2586796fa381d8441b87aa635c5fb2a3170

diff --git a/t/50-external.t b/t/50-external.t
index e9c828b..d34db9c 100644
--- a/t/50-external.t
+++ b/t/50-external.t
@@ -5,41 +5,45 @@ use warnings;
 
 use Config;
 
-use Test::More tests => 6;
+use Test::More tests => 8;
 
 use lib 't/lib';
-use VPIT::TestHelpers;
+use VPIT::TestHelpers 'run_perl';
 
 BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
-{
+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 +52,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 +60,26 @@ 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';
 }
+
+SKIP: {
+ my $status;
+ for my $run (1 .. 10) {
+  $status = run_perl_file 't/testcases/rt115392.pl';
+  skip RUN_PERL_FAILED() => 1 unless defined $status;
+  last if $status;
+ }
+ is $status, 0, 'RT #115392';
+}
+
+SKIP: {
+ my $status = run_perl_file 't/testcases/babycart_in_heredoc.pl';
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
+ is $status, 0, 'babycart in heredoc';
+}