Refactor 6 tests in t/op and t/run to use skip_all_if_miniperl().

diff --git a/t/op/attrhand.t b/t/op/attrhand.t
index 8c89f7f..996d572 100644 (file)
--- a/t/op/attrhand.t
+++ b/t/op/attrhand.t
@@ -1,13 +1,10 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ($ENV{PERL_CORE_MINITEST}) {
-       print "1..0 # skip: miniperl can't load attributes\n";
-       exit 0;
-    }
     chdir 't' if -d 't';
     @INC = '../lib';
     require './test.pl';
+    skip_all_if_miniperl("miniperl can't load attributes");
 }
 
 plan tests => 4;

diff --git a/t/op/attrs.t b/t/op/attrs.t
index d568af6..89becf6 100644 (file)
--- a/t/op/attrs.t
+++ b/t/op/attrs.t
@@ -3,13 +3,10 @@
 # Regression tests for attributes.pm and the C< : attrs> syntax.
 
 BEGIN {
-    if ($ENV{PERL_CORE_MINITEST}) {
-       print "1..0 # skip: miniperl can't load attributes\n";
-       exit 0;
-    }
     chdir 't' if -d 't';
     @INC = '../lib';
     require './test.pl';
+    skip_all_if_miniperl("miniperl can't load attributes");
 }
 
 use warnings;

diff --git a/t/op/incfilter.t b/t/op/incfilter.t
index 0b763e4..d0e8f75 100644 (file)
--- a/t/op/incfilter.t
+++ b/t/op/incfilter.t
@@ -5,15 +5,12 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = qw(. ../lib);
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl\n";
-        exit 0;
-    }
+    require 'test.pl';
+    skip_all_if_miniperl('no dynamic loading on miniperl, no Filter::Util::Call');
     unless (find PerlIO::Layer 'perlio') {
        print "1..0 # Skip: not perlio\n";
        exit 0;
     }
-    require "test.pl";
 }
 use strict;
 use Config;

diff --git a/t/op/threads-dirh.t b/t/op/threads-dirh.t
index 616aa6b..900a62a 100644 (file)
--- a/t/op/threads-dirh.t
+++ b/t/op/threads-dirh.t
@@ -13,10 +13,7 @@ BEGIN {
         print "1..0 # Skip: no ithreads\n";
         exit 0;
      }
-     if ($ENV{PERL_CORE_MINITEST}) {
-       print "1..0 # Skip: no dynamic loading on miniperl, no threads\n";
-       exit 0;
-     }
+     skip_all_if_miniperl("no dynamic loading on miniperl, no threads");
 
      plan(6);
 }

diff --git a/t/op/threads.t b/t/op/threads.t
index 4b731f0..94dad6e 100644 (file)
--- a/t/op/threads.t
+++ b/t/op/threads.t
@@ -11,10 +11,7 @@ BEGIN {
         print "1..0 # Skip: no ithreads\n";
         exit 0;
      }
-     if ($ENV{PERL_CORE_MINITEST}) {
-       print "1..0 # Skip: no dynamic loading on miniperl, no threads\n";
-       exit 0;
-     }
+     skip_all_if_miniperl("no dynamic loading on miniperl, no threads");
 
      plan(24);
 }

diff --git a/t/run/switchC.t b/t/run/switchC.t
index b6231ca..9297286 100644 (file)
--- a/t/run/switchC.t
+++ b/t/run/switchC.t
@@ -5,19 +5,15 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
+    require "./test.pl";
+
     unless (find PerlIO::Layer 'perlio') {
        print "1..0 # Skip: not perlio\n";
        exit 0;
     }
-    if ($ENV{PERL_CORE_MINITEST}) {
-       print "1..0 # Skip : -C and \$ENV{PERL_UNICODE} are disabled on miniperl\n";
-       exit 0;
-    }
-       
+    skip_all_if_miniperl('-C and $ENV{PERL_UNICODE} are disabled on miniperl');
 }
 
-BEGIN { require "./test.pl"; }
-
 plan(tests => 13);
 
 my $r;