X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-scope.t;h=e4d667c33d6ab5fbdc25956ee81142c575fd3c6c;hb=89371b5b8966e2ea12eb637b830034e1308762b0;hp=eafc59c67b466d7258e7517b1a8bd8fccca7138f;hpb=79fe38872567977419089da38eac9406bf2d4afa;p=perl%2Fmodules%2Findirect.git

diff --git a/t/30-scope.t b/t/30-scope.t
index eafc59c..e4d667c 100644
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -3,12 +3,9 @@
 use strict;
 use warnings;
 
-my $total;
-BEGIN {
- $total = 8;
-}
+my $total = 8;
 
-use Test::More tests => $total + 1;
+use Test::More;
 
 use IPC::Cmd qw/run/;
 
@@ -16,14 +13,21 @@ use IPC::Cmd qw/run/;
  = run command => [
           $^X,
           map('-I' . $_, @INC),
+          $ENV{PERL5OPT} || '',
           '-c',
           't/data/mixed.d'
    ];
+
+plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
+plan tests => $total + 1;
+
+$stderr = join '', @{$stderr || []};
 unless ($success) {
- $stderr = pop @$stderr if ref $stderr eq 'ARRAY';
- BAIL_OUT("Failed to execute data file (error $err_code) : $stderr");
+ diag $stderr;
+ diag "Failed to execute data file (error $err_code)";
+ fail "Couldn't run test $_" for 1 .. $total + 1;
+ exit $total + 1;
 }
-$stderr = join "\n", @$stderr if ref $stderr eq 'ARRAY';
 
 my %fail = map { $_ => 1 } 2, 3, 5, 7;
 my %failed;