Convert B's "no perlio" skips to "skip all" in the BEGIN blocks.

Previously they called the skip function, and needed to know the number of
tests declared by the plan.

diff --git a/ext/B/t/optree_check.t b/ext/B/t/optree_check.t
index 1629677..002fe9b 100644 (file)
--- a/ext/B/t/optree_check.t
+++ b/ext/B/t/optree_check.t
@@ -7,7 +7,10 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    # require 'test.pl'; # now done by OptreeCheck
+    if (!$Config::Config{useperlio}) {
+        print "1..0 # Skip -- need perlio to walk the optree\n";
+        exit 0;
+    }
 }
 
 use OptreeCheck;
@@ -23,13 +26,7 @@ cmdline args in 'standard' way across all clients of OptreeCheck.
 
 =cut
 
-my $tests = 5 + 15 + 16 * $gOpts{selftest};    # pass()s + $#tests
-plan tests => $tests;
-
-SKIP: {
-    skip "no perlio in this build", $tests
-    unless $Config::Config{useperlio};
-
+plan tests => 5 + 15 + 16 * $gOpts{selftest};  # pass()s + $#tests
 
 pass("REGEX TEST HARNESS SELFTEST");
 
@@ -222,8 +219,3 @@ EOT_EOT
 # 6  <2> sassign sKS/2
 # 7  <1> leavesub[1 ref] K/REFC,1
 EONT_EONT
-
-} # skip
-
-__END__
-

diff --git a/ext/B/t/optree_concise.t b/ext/B/t/optree_concise.t
index 22a3ff8..df4162a 100644 (file)
--- a/ext/B/t/optree_concise.t
+++ b/ext/B/t/optree_concise.t
@@ -7,17 +7,17 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    # require 'test.pl'; # now done by OptreeCheck
+    if (!$Config::Config{useperlio}) {
+        print "1..0 # Skip -- need perlio to walk the optree\n";
+        exit 0;
+    }
 }
 
 # import checkOptree(), and %gOpts (containing test state)
 use OptreeCheck;       # ALSO DOES @ARGV HANDLING !!!!!!
 use Config;
 
-my $tests = 23;
-plan tests => $tests;
-SKIP: {
-skip "no perlio in this build", $tests unless $Config::Config{useperlio};
+plan tests => 23;
 
 $SIG{__WARN__} = sub {
     my $err = shift;
@@ -469,6 +469,3 @@ EOT_EOT
 7  <1> leavesub[1 ref] K/REFC,1 ->(end) 
 1        <;> nextstate(main 76 optree_concise.t:407) v ->2 
 EONT_EONT
-
-} #skip
-

diff --git a/ext/B/t/optree_constants.t b/ext/B/t/optree_constants.t
index 712704b..b90c874 100644 (file)
--- a/ext/B/t/optree_constants.t
+++ b/ext/B/t/optree_constants.t
@@ -7,16 +7,16 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    # require 'test.pl'; # now done by OptreeCheck
+    if (!$Config::Config{useperlio}) {
+        print "1..0 # Skip -- need perlio to walk the optree\n";
+        exit 0;
+    }
 }
 
 use OptreeCheck;       # ALSO DOES @ARGV HANDLING !!!!!!
 use Config;
 
-my $tests = 30;
-plan tests => $tests;
-SKIP: {
-skip "no perlio in this build", $tests unless $Config::Config{useperlio};
+plan tests => 30;
 
 #################################
 
@@ -243,8 +243,6 @@ checkOptree ( name  => 'call many in a print statement',
              strip_open_hints => 1,
              expect => $expect, expect_nt => $expect_nt);
 
-} #skip
-
 __END__
 
 =head NB

diff --git a/ext/B/t/optree_samples.t b/ext/B/t/optree_samples.t
index 4e25676..82f8817 100644 (file)
--- a/ext/B/t/optree_samples.t
+++ b/ext/B/t/optree_samples.t
@@ -7,13 +7,14 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    # require 'test.pl'; # now done by OptreeCheck
+    if (!$Config::Config{useperlio}) {
+        print "1..0 # Skip -- need perlio to walk the optree\n";
+        exit 0;
+    }
 }
 use OptreeCheck;
 use Config;
 plan tests     => 20;
-SKIP: {
-    skip "no perlio in this build", 20 unless $Config::Config{useperlio};
 
 pass("GENERAL OPTREE EXAMPLES");
 
@@ -628,8 +629,6 @@ EOT_EOT
 # 6  <@> leave[1 ref] vKP/REFC
 EONT_EONT
 
-} # skip
-
 __END__
 
 #######################################################################

diff --git a/ext/B/t/optree_sort.t b/ext/B/t/optree_sort.t
index e4dd416..97d3d78 100644 (file)
--- a/ext/B/t/optree_sort.t
+++ b/ext/B/t/optree_sort.t
@@ -7,15 +7,15 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    # require 'test.pl'; # now done by OptreeCheck
+    if (!$Config::Config{useperlio}) {
+        print "1..0 # Skip -- need perlio to walk the optree\n";
+        exit 0;
+    }
 }
 use OptreeCheck;
 use Config;
 plan tests => 11;
 
-SKIP: {
-skip "no perlio in this build", 11 unless $Config::Config{useperlio};
-
 pass("SORT OPTIMIZATION");
 
 checkOptree ( name     => 'sub {sort @a}',
@@ -303,8 +303,3 @@ EOT_EOT
 # 9  <$> const(IV 1) s
 # a  <1> leavesub[1 ref] K/REFC,1
 EONT_EONT
-
-} #skip
-
-__END__
-

diff --git a/ext/B/t/optree_varinit.t b/ext/B/t/optree_varinit.t
index 5271a65..ca3ad23 100644 (file)
--- a/ext/B/t/optree_varinit.t
+++ b/ext/B/t/optree_varinit.t
@@ -7,13 +7,14 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
-    # require 'test.pl'; # now done by OptreeCheck
+    if (!$Config::Config{useperlio}) {
+        print "1..0 # Skip -- need perlio to walk the optree\n";
+        exit 0;
+    }
 }
 use OptreeCheck;
 use Config;
 plan tests     => 22;
-SKIP: {
-skip "no perlio in this build", 22 unless $Config::Config{useperlio};
 
 pass("OPTIMIZER TESTS - VAR INITIALIZATION");
 
@@ -404,8 +405,3 @@ EOT_EOT
 # 7  <2> aassign[t3] vKS
 # 8  <@> leave[1 ref] vKP/REFC
 EONT_EONT
-
-} #skip
-
-__END__
-