diff options
| -rw-r--r-- | t/uni/chomp.t | 6 | ||||
| -rw-r--r-- | t/uni/tr_7jis.t | 5 | ||||
| -rw-r--r-- | t/uni/tr_eucjp.t | 5 | ||||
| -rw-r--r-- | t/uni/tr_sjis.t | 5 | ||||
| -rw-r--r-- | t/uni/tr_utf8.t | 5 |
5 files changed, 11 insertions, 15 deletions
diff --git a/t/uni/chomp.t b/t/uni/chomp.t index 00d6e4642a..12f1375002 100644 --- a/t/uni/chomp.t +++ b/t/uni/chomp.t @@ -18,13 +18,13 @@ BEGIN { print "1..0 # Skip: PerlIO required\n"; exit 0; } - eval 'use Encode'; - if ($@ =~ /dynamic loading not available/) { - print "1..0 # Skip: no dynamic loading, no Encode\n"; + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n"; exit 0; } } +use Encode; use strict; use Test::More; diff --git a/t/uni/tr_7jis.t b/t/uni/tr_7jis.t index 6e74f1daa8..5443880cba 100644 --- a/t/uni/tr_7jis.t +++ b/t/uni/tr_7jis.t @@ -23,9 +23,8 @@ BEGIN { print "1..0 # Skip: PerlIO required\n"; exit 0; } - eval 'use Encode'; - if ($@ =~ /dynamic loading not available/) { - print "1..0 # Skip: no dynamic loading, no Encode\n"; + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n"; exit 0; } $| = 1; diff --git a/t/uni/tr_eucjp.t b/t/uni/tr_eucjp.t index 6958f465a8..9d600799b8 100644 --- a/t/uni/tr_eucjp.t +++ b/t/uni/tr_eucjp.t @@ -22,9 +22,8 @@ BEGIN { print "1..0 # Skip: PerlIO required\n"; exit 0; } - eval 'use Encode'; - if ($@ =~ /dynamic loading not available/) { - print "1..0 # Skip: no dynamic loading, no Encode\n"; + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n"; exit 0; } $| = 1; diff --git a/t/uni/tr_sjis.t b/t/uni/tr_sjis.t index 732eb1ab0b..6fda9f2807 100644 --- a/t/uni/tr_sjis.t +++ b/t/uni/tr_sjis.t @@ -22,9 +22,8 @@ BEGIN { print "1..0 # Skip: PerlIO required\n"; exit 0; } - eval 'use Encode'; - if ($@ =~ /dynamic loading not available/) { - print "1..0 # Skip: no dynamic loading, no Encode\n"; + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n"; exit 0; } $| = 1; diff --git a/t/uni/tr_utf8.t b/t/uni/tr_utf8.t index e623909549..4b35c6d323 100644 --- a/t/uni/tr_utf8.t +++ b/t/uni/tr_utf8.t @@ -23,9 +23,8 @@ BEGIN { print "1..0 # Skip: PerlIO required\n"; exit 0; } - eval 'use Encode'; - if ($@ =~ /dynamic loading not available/) { - print "1..0 # Skip: no dynamic loading, no Encode\n"; + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n"; exit 0; } $| = 1; |