X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F50-external.t;fp=t%2F50-external.t;h=ebf123f8487231e30af519891772062bde9e94d4;hp=b98a18fb96425d75495605ef1ce8a011fba5f009;hb=8845e141913781c0e0b4b928a38fd23da1752f6b;hpb=44fb7d6a933c6ebd76082e74c60dab5e5a5da50e

diff --git a/t/50-external.t b/t/50-external.t
index b98a18f..ebf123f 100644
--- a/t/50-external.t
+++ b/t/50-external.t
@@ -8,15 +8,13 @@ use Config;
 use Test::More tests => 6;
 
 use lib 't/lib';
-use VPIT::TestHelpers;
+use VPIT::TestHelpers 'run_perl';
 
 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;
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
  is $status, 0, 'RT #47866';
 }
 
@@ -24,7 +22,7 @@ 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;
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
  is $status, 2 << 8, 'no semicolon at the end of -e';
 }
 
@@ -32,7 +30,7 @@ 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;
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
  is $status, 0, 'indirect is not getting upset by Devel::CallParser';
 }
 
@@ -45,7 +43,7 @@ SKIP: {
                                                       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;
+ skip RUN_PERL_FAILED() => 1 unless defined $status;
  is $status, 0, 'indirect does not croak while package empty is in use';
 }
 
@@ -62,10 +60,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;
+ 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;
+ 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';
 }