Skip when we couldn't capture buffers

diff --git a/t/10-good-no.t b/t/10-good-no.t
index ac16d4630a6b844c0c4f048862117bb07aa2d606..71d5668ba4f3a95ceff5564e1843d40be29da251 100644 (file)
--- a/t/10-good-no.t
+++ b/t/10-good-no.t
@@ -3,12 +3,9 @@
 use strict;
 use warnings;
 
-my $total;
-BEGIN {
- $total = 32;
-}
+my $total = 32;
 
-use Test::More tests => $total + 1;
+use Test::More;
 
 use IPC::Cmd qw/run/;
 
@@ -20,6 +17,10 @@ use IPC::Cmd qw/run/;
           '-c',
           't/data/good.d'
    ];
+
+plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
+plan tests => $total + 1;
+
 $stderr = join '', @$stderr;
 unless ($success) {
  diag $stderr;

diff --git a/t/11-good-use.t b/t/11-good-use.t
index f1576117cadd5329416434e2d643f3036cca3eb2..8cf224adefb128beca92911f5346ecfd1982030b 100644 (file)
--- a/t/11-good-use.t
+++ b/t/11-good-use.t
@@ -3,12 +3,9 @@
 use strict;
 use warnings;
 
-my $total;
-BEGIN {
- $total = 32;
-}
+my $total = 32;
 
-use Test::More tests => $total + 1;
+use Test::More;
 
 use IPC::Cmd qw/run/;
 
@@ -20,6 +17,10 @@ use IPC::Cmd qw/run/;
           '-c',
           't/data/good.d'
    ];
+
+plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
+plan tests => $total + 1;
+
 $stderr = join '', @$stderr;
 unless ($success) {
  diag $stderr;

diff --git a/t/20-bad-no.t b/t/20-bad-no.t
index 0980b1fdabca524b181c420f024c4befc567738b..a5dfd2a20d8fe1493dacadc3b93eb923f0a668fe 100644 (file)
--- a/t/20-bad-no.t
+++ b/t/20-bad-no.t
@@ -3,12 +3,9 @@
 use strict;
 use warnings;
 
-my $total;
-BEGIN {
- $total = 28;
-}
+my $total = 28;
 
-use Test::More tests => $total + 1;
+use Test::More;
 
 use IPC::Cmd qw/run/;
 
@@ -20,6 +17,10 @@ use IPC::Cmd qw/run/;
           '-c',
           't/data/bad.d'
    ];
+
+plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
+plan tests => $total + 1;
+
 $stderr = join '', @$stderr;
 unless ($success) {
  diag $stderr;

diff --git a/t/21-bad-use.t b/t/21-bad-use.t
index 1499b2bf40147e571e7898e303a4edfea4c41869..5993d246d55e1cd214f009e2742d1229eb56c042 100644 (file)
--- a/t/21-bad-use.t
+++ b/t/21-bad-use.t
@@ -3,12 +3,9 @@
 use strict;
 use warnings;
 
-my $total;
-BEGIN {
- $total = 28;
-}
+my $total = 28;
 
-use Test::More tests => $total + 1;
+use Test::More;
 
 use IPC::Cmd qw/run/;
 
@@ -20,6 +17,10 @@ use IPC::Cmd qw/run/;
           '-c',
           't/data/bad.d'
    ];
+
+plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
+plan tests => $total + 1;
+
 $stderr = join '', @$stderr;
 unless ($success) {
  diag $stderr;

diff --git a/t/22-bad-fatal.t b/t/22-bad-fatal.t
index 64348d91cc0384e91add4ac53f3fc9fc8360d91f..e374a8df8cd0fcf01fd88d2ab182e83b30c0cbf9 100644 (file)
--- a/t/22-bad-fatal.t
+++ b/t/22-bad-fatal.t
@@ -3,12 +3,7 @@
 use strict;
 use warnings;
 
-my $total;
-BEGIN {
- $total = 20;
-}
-
-use Test::More tests => 1;
+use Test::More;
 
 use IPC::Cmd qw/run/;
 
@@ -21,5 +16,8 @@ use IPC::Cmd qw/run/;
           't/data/bad.d'
    ];
 
+plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
+plan tests => 1;
+
 $stderr = join '', @$stderr;
 ok(!$success && $err_code && $stderr =~ /^Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"Hlagh1"/mg, 'croak when :fatal is specified');

diff --git a/t/30-scope.t b/t/30-scope.t
index f006f8147a699764b0432e14b764fc2c2d3effaa..0174870ddbdf712bedf5669bf0af6ba36c4ed562 100644 (file)
--- 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/;
 
@@ -19,6 +16,10 @@ use IPC::Cmd qw/run/;
           '-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) {
  diag $stderr;