tests: add codeset-utf8 as a feature

To avoid having to use <precheck> for tests that require UTF-8 support.

Closes #15039

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index aa02baff1fa7b41177fd500d0bbb1b0b09fe0209..fc773b6a280ff1a3e05ee10b3172ae8dc087189e 100644 (file)
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -432,6 +432,7 @@ Features testable here are:
 - `brotli`
 - `c-ares`
 - `CharConv`
+- `codeset-utf8`. If the running codeset is UTF-8 capable.
 - `cookies`
 - `crypto`
 - `Debug`

diff --git a/tests/data/test1034 b/tests/data/test1034
index 09a4dd5f3fd5b2573160ed36e8b9659c4e237b37..7e62f6d63b412194b1e1c048803258d5fcbb1727 100644 (file)
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -26,14 +26,12 @@ none
 IDN
 http
 proxy
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 HTTP over proxy with malformatted IDN host name
 </name>

diff --git a/tests/data/test1035 b/tests/data/test1035
index 0bbaabf9c8ff262b897d42b00a89385fcc7183cc..e162022fe874d259d276956dc46fef3ef34ba7ff 100644 (file)
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -24,19 +24,17 @@ none
 IDN
 http
 proxy
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 HTTP over proxy with too long IDN host name
 </name>
 <command>
-http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT
+http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 

diff --git a/tests/data/test1448 b/tests/data/test1448
index 1544d3936f45bc4afc6fcd06b1f7b3f98fc76665..33aedc4f011a5a3a9e5d6527ab7c9e88e9f28c9f 100644 (file)
--- a/tests/data/test1448
+++ b/tests/data/test1448
@@ -40,14 +40,12 @@ http
 </server>
 <features>
 IDN
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 Redirect following to UTF-8 IDN host name
 </name>

diff --git a/tests/data/test165 b/tests/data/test165
index e9237d89cddddcfe8d9821bccd2e87904266898b..39787db87e593abf785ff9140d0b85d543b78434 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -30,14 +30,12 @@ http
 <features>
 IDN
 proxy
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 HTTP over proxy with IDN host name
 </name>

diff --git a/tests/data/test2046 b/tests/data/test2046
index 3aefd25c9667502ab17675932d5ec09d9a365245..c0d3a0e82503369c456193589cdd33b5be51cd36 100644 (file)
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -40,14 +40,12 @@ http
 </server>
 <features>
 IDN
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 Connection reuse with IDN host name
 </name>

diff --git a/tests/data/test2047 b/tests/data/test2047
index 82e9a14aaa43c25edb2cdfe70661b1f032cdeb58..1d7be6db364a848e3823feb0fc5ae838af1c5e71 100644 (file)
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -41,14 +41,12 @@ http
 <features>
 IDN
 proxy
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 Connection reuse with IDN host name over HTTP proxy
 </name>

diff --git a/tests/data/test955 b/tests/data/test955
index 24cc2b7e431468ffad1db31da16c224c6f6dc95f..982afc352ee6edb22ba686533793a892d9350d06 100644 (file)
--- a/tests/data/test955
+++ b/tests/data/test955
@@ -21,14 +21,12 @@ smtp
 </server>
 <features>
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (local part only)
 </name>

diff --git a/tests/data/test956 b/tests/data/test956
index 1180523bbd2b8934640f8982a006d2fcee5b6254..22bf3a14fa172dcf6cef521f69368e812fa2cbf9 100644 (file)
--- a/tests/data/test956
+++ b/tests/data/test956
@@ -18,14 +18,12 @@ smtp
 </server>
 <features>
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only)
 </name>

diff --git a/tests/data/test957 b/tests/data/test957
index 1b01b7e53acaefe5da8b4e204cd1b5f0c7220008..d49739d84f0a7c04749fc5b03f59c76808ad4268 100644 (file)
--- a/tests/data/test957
+++ b/tests/data/test957
@@ -19,14 +19,12 @@ smtp
 </server>
 <features>
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
 </name>

diff --git a/tests/data/test958 b/tests/data/test958
index 3ad77fe1030822dcb9cb84491883185f13bd397a..ea5a2dbae64dc574dce3e4ced09b1ccb48d1205a 100644 (file)
--- a/tests/data/test958
+++ b/tests/data/test958
@@ -19,14 +19,12 @@ smtp
 </server>
 <features>
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
 </name>

diff --git a/tests/data/test959 b/tests/data/test959
index 421d6ba98767f039f0d653237307df78b507f9d5..178e0f13c40706b0e5fb30fadfabe2bc31ede64b 100644 (file)
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -22,14 +22,12 @@ smtp
 <features>
 !IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
 </name>

diff --git a/tests/data/test960 b/tests/data/test960
index 9f33fdc7977852bea02725163c7d93213ea90b88..2cf348eb53dce49a4fcd98c2d39d9ec769252d86 100644 (file)
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -19,14 +19,12 @@ smtp
 <features>
 !IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only)
 </name>

diff --git a/tests/data/test961 b/tests/data/test961
index c416b97614ba1a63cab4009c7c383bc58ef71976..57958a4eb0afc01ee258284b27603ff76a0d8623 100644 (file)
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -20,14 +20,12 @@ smtp
 <features>
 !IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (host part only)
 </name>

diff --git a/tests/data/test962 b/tests/data/test962
index 09bfb51000d003866bfd6c92cab469b2abdb0b1b..6ac4ab08c2d85cb85c276ad2bc3482a85b08b5e9 100644 (file)
--- a/tests/data/test962
+++ b/tests/data/test962
@@ -20,14 +20,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
 </name>

diff --git a/tests/data/test963 b/tests/data/test963
index 02fc0b851b565f9cbcf46b39c504561c441e049d..9fe94f894cef2b846ee09ca3739f7023d7bdcc25 100644 (file)
--- a/tests/data/test963
+++ b/tests/data/test963
@@ -20,14 +20,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
 </name>

diff --git a/tests/data/test964 b/tests/data/test964
index e03dc333e482d8c59bb17616e0a150d799741a7c..05dbda9319bd5ebe0fb01f97dd9043f2c7fcc175 100644 (file)
--- a/tests/data/test964
+++ b/tests/data/test964
@@ -21,14 +21,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP external VRFY without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
 </name>

diff --git a/tests/data/test965 b/tests/data/test965
index f8adbdefe944dad3e667d99d5c66528f15821aa2..f44239e784c692d27136caaba6f98ce25e93be31 100644 (file)
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -23,14 +23,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP with SMTPUTF8 support - UTF-8 based sender
 </name>

diff --git a/tests/data/test966 b/tests/data/test966
index e43f860ec49461169aafc1b51f2d1b2808042489..31b6c288f1c34aed7e14bec32377e84bf0f69b41 100644 (file)
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -23,14 +23,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP with SMTPUTF8 support - UTF-8 based recipient
 </name>

diff --git a/tests/data/test967 b/tests/data/test967
index 898fbb106b4d8848e712b1bc9d3b4f225b702386..d823b4839e9e1cdb63eb76b522209864e84d0278 100644 (file)
--- a/tests/data/test967
+++ b/tests/data/test967
@@ -27,14 +27,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP external VRFY with SMTPUTF8 support
 </name>

diff --git a/tests/data/test968 b/tests/data/test968
index c27a3675f85e5c8c6f7f3d5e2c0bc9cf2611c494..b057be62917c63c7b94331ec38122e7db5e892ad 100644 (file)
--- a/tests/data/test968
+++ b/tests/data/test968
@@ -24,14 +24,12 @@ smtp
 <features>
 IDN
 !win32
+codeset-utf8
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
 </setenv>
-<precheck>
-perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
-</precheck>
 <name>
 SMTP VRFY with SMTPUTF8 support
 </name>

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 4764ba31aabe0f1a6a0f47ce2dc5b10ce55cca46..197e1458963d3f76a24f782045c160e524f75fca 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -83,6 +83,7 @@ BEGIN {
 
 use Digest::MD5 qw(md5);
 use List::Util 'sum';
+use I18N::Langinfo qw(langinfo CODESET);
 
 use pathhelp qw(
     exe_ext
@@ -825,6 +826,7 @@ sub checksystemfeatures {
     $feature{"large-time"} = 1;
     $feature{"sha512-256"} = 1;
     $feature{"local-http"} = servers::localhttp();
+    $feature{"codeset-utf8"} = lc(langinfo(CODESET())) eq "utf-8";
 
     # make each protocol an enabled "feature"
     for my $p (@protocols) {