Simplify the startup skip logic of tests in t/uni.

Use the various skip_all*() functions in test.pl to express the desired intent.

diff --git a/t/uni/chomp.t b/t/uni/chomp.t
index 6aef50c..1292fb6 100644 (file)
--- a/t/uni/chomp.t
+++ b/t/uni/chomp.t
@@ -1,25 +1,11 @@
 #!./perl -w
 
 BEGIN {
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 8d7924f..227dc52 100644 (file)
--- a/t/uni/chr.t
+++ b/t/uni/chr.t
@@ -1,26 +1,11 @@
 #!./perl -w
 
 BEGIN {
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
-
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 a8102f3..a1ca3c4 100644 (file)
--- a/t/uni/greek.t
+++ b/t/uni/greek.t
@@ -1,27 +1,11 @@
+#!./perl -w
+
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        @INC = '../lib';
-    }
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 08928b6..344d1a8 100644 (file)
--- a/t/uni/latin2.t
+++ b/t/uni/latin2.t
@@ -1,27 +1,11 @@
+#!./perl -w
+
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        @INC = '../lib';
-    }
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 46f80a1..90f3431 100644 (file)
--- a/t/uni/tr_7jis.t
+++ b/t/uni/tr_7jis.t
@@ -5,25 +5,11 @@
 # -- dankogai
 
 BEGIN {
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 6b2ca2b..352684d 100644 (file)
--- a/t/uni/tr_eucjp.t
+++ b/t/uni/tr_eucjp.t
@@ -4,25 +4,11 @@
 # -- dankogai
 
 BEGIN {
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 d71c4ba..fca9d6c 100644 (file)
--- a/t/uni/tr_sjis.t
+++ b/t/uni/tr_sjis.t
@@ -4,25 +4,11 @@
 # -- dankogai
 
 BEGIN {
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no 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 8e697ce..aa8f439 100644 (file)
--- a/t/uni/tr_utf8.t
+++ b/t/uni/tr_utf8.t
@@ -5,29 +5,11 @@
 # -- dankogai
 
 BEGIN {
-    if ($ENV{'PERL_CORE'}){
-        chdir 't';
-        @INC = '../lib';
-    }
-    require Config; import Config;
-    if ($Config{'extensions'} !~ /\bEncode\b/) {
-      print "1..0 # Skip: Encode was not built\n";
-      exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC\n";
-        exit 0;
-    }
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if ($ENV{PERL_CORE_MINITEST}) {
-        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
-        exit 0;
-    }
-    $| = 1;
     require './test.pl';
+    skip_all_if_miniperl("no dynamic loading on miniperl, no Encode");
+    skip_all("EBCDIC") if $::IS_EBCDIC;
+    skip_all_without_perlio();
+    skip_all_without_extension('Encode');
 }
 
 use strict;

diff --git a/t/uni/write.t b/t/uni/write.t
index 136be67..c60065d 100644 (file)
--- a/t/uni/write.t
+++ b/t/uni/write.t
@@ -2,17 +2,9 @@
 use strict;
 
 BEGIN {
-    chdir 't' if -d 't';
-    @INC = qw(../lib .);
-    require "test.pl";
-    unless (PerlIO::Layer->find('perlio')){
-        print "1..0 # Skip: PerlIO required\n";
-        exit 0;
-    }
-    if (ord("A") == 193) {
-        print "1..0 # Skip: EBCDIC porting needed\n";
-        exit 0;
-    }
+    require './test.pl';
+    skip_all("EBCDIC porting needed") if $::IS_EBCDIC;
+    skip_all_without_perlio();
 }
 
 plan tests => 6;