12 files changed, 13 insertions, 23 deletions

diff --git a/t/io/layers.t b/t/io/layers.t
index d0b55f1742..55dc2fa06b 100644
--- a/t/io/layers.t
+++ b/t/io/layers.t
@@ -8,8 +8,7 @@ BEGIN {
     require './test.pl';
     skip_all_without_perlio();
     # FIXME - more of these could be tested without Encode or full perl
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
-    skip_all_without_extension('Encode');
+    skip_all_without_dynamic_extension('Encode');
 
     # Makes testing easier.
     $ENV{PERLIO} = 'stdio' if exists $ENV{PERLIO} && $ENV{PERLIO} eq '';
diff --git a/t/io/perlio_open.t b/t/io/perlio_open.t
index 9969796a36..702c76c35e 100644
--- a/t/io/perlio_open.t
+++ b/t/io/perlio_open.t
@@ -5,8 +5,7 @@ BEGIN {
     @INC = '../lib';
     require './test.pl';
     skip_all_without_perlio();
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Fcntl");
-    skip_all_without_extension('Fcntl'); # how did you get this far?
+    skip_all_without_dynamic_extension('Fcntl'); # how did you get this far?
 }
 
 use strict;
diff --git a/t/lib/proxy_constant_subs.t b/t/lib/proxy_constant_subs.t
index c6de618624..e3cb41dbc3 100644
--- a/t/lib/proxy_constant_subs.t
+++ b/t/lib/proxy_constant_subs.t
@@ -1,8 +1,7 @@
 my @symbols;
 BEGIN {
     require './test.pl';
-    skip_all_without_extension('B');
-    skip_all_without_extension('Fcntl');
+    skip_all_without_dynamic_extension($_) foreach qw(B Fcntl);
     # S_IFMT is a real subroutine, and acts as control
     # SEEK_SET is a proxy constant subroutine.
     @symbols = qw(S_IFMT SEEK_SET);
diff --git a/t/test.pl b/t/test.pl
index 34150aacb2..21bf1d2cdb 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -122,8 +122,9 @@ sub skip_all_if_miniperl {
     skip_all(@_) if is_miniperl();
 }
 
-sub skip_all_without_extension {
+sub skip_all_without_dynamic_extension {
     my $extension = shift;
+    skip_all("no dynamic loading on miniperl, no $extension") if is_miniperl();
     unless (eval {require Config; 1}) {
 	warn "test.pl had problems loading Config: $@";
 	return;
diff --git a/t/uni/chomp.t b/t/uni/chomp.t
index 1292fb690b..0dca91a9bf 100644
--- a/t/uni/chomp.t
+++ b/t/uni/chomp.t
@@ -2,10 +2,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 use strict;
diff --git a/t/uni/chr.t b/t/uni/chr.t
index 227dc52361..33283e779a 100644
--- a/t/uni/chr.t
+++ b/t/uni/chr.t
@@ -2,10 +2,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 use strict;
diff --git a/t/uni/greek.t b/t/uni/greek.t
index a1ca3c4a27..1737a679fa 100644
--- a/t/uni/greek.t
+++ b/t/uni/greek.t
@@ -2,10 +2,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 plan tests => 72;
diff --git a/t/uni/latin2.t b/t/uni/latin2.t
index 344d1a8279..152747139e 100644
--- a/t/uni/latin2.t
+++ b/t/uni/latin2.t
@@ -2,10 +2,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 plan tests => 94;
diff --git a/t/uni/tr_7jis.t b/t/uni/tr_7jis.t
index 90f34310b2..2118070bfc 100644
--- a/t/uni/tr_7jis.t
+++ b/t/uni/tr_7jis.t
@@ -6,10 +6,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 use strict;
diff --git a/t/uni/tr_eucjp.t b/t/uni/tr_eucjp.t
index 352684d64a..27daf3262b 100644
--- a/t/uni/tr_eucjp.t
+++ b/t/uni/tr_eucjp.t
@@ -5,10 +5,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 use strict;
diff --git a/t/uni/tr_sjis.t b/t/uni/tr_sjis.t
index fca9d6c804..290dd8cf73 100644
--- a/t/uni/tr_sjis.t
+++ b/t/uni/tr_sjis.t
@@ -5,10 +5,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 use strict;
diff --git a/t/uni/tr_utf8.t b/t/uni/tr_utf8.t
index aa8f439820..25a6753365 100644
--- a/t/uni/tr_utf8.t
+++ b/t/uni/tr_utf8.t
@@ -6,10 +6,9 @@
 
 BEGIN {
     require './test.pl';
-    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
-    skip_all_without_extension('Encode');
 }
 
 use strict;