tests: add codeset-utf8 as a feature

To avoid having to use <precheck> for tests that require UTF-8 support. Closes curl#15039
tarantool · Sep 26, 2024 · 0b70b23 · 0b70b23
1 parent 5fb1b64
commit 0b70b23
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 61 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) {