diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2017-02-23 21:47:17 +0100 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2017-02-25 15:33:29 +0100 |
| commit | c6ddb606d8a3fdbe89763f7299e7f43cf6581567 (patch) | |
| tree | 2499fedcf9ff081deadeb83141f8e36192cbd114 /tests/data/test1035 | |
| parent | 832b0105f2273b94e07d1396ecb4a57db5ae08e1 (diff) | |
tests: use consistent environment variables for setting charset
The character set in POSIX is set by the locale defined by (in
decreasing order of precedence) the LC_ALL, LC_CTYPE and LANG
environment variables (CHARSET was used by libidn but not libidn2).
LC_ALL is cleared to ensure that LC_CTYPE takes effect, but LC_ALL is
not used to set the locale to ensure that other parts of the locale
aren't overridden. Since there doesn't seem to be a cross-platform way
of specifying a UTF-8 locale, and not all systems may support UTF-8, a
<precheck> is used to skip the test if UTF-8 can't be verified to be
available. Test 1035 was also converted to UTF-8 for consistency, as
the actual character set used there is irrelevant to the test.
This patch uses a different UTF-8 locale than the last attempt, namely
en_US.UTF-8. This one has been verified on 7 different Linux and BSD
distributions and is more complete and usable than the locale UTF-8 (on
at least some systems).
Diffstat (limited to 'tests/data/test1035')
| -rw-r--r-- | tests/data/test1035 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/data/test1035 b/tests/data/test1035 index 05172ec9a..033a48a72 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -32,14 +32,17 @@ http idn </features> <setenv> -CHARSET=UTF-8 -LANG=en_US.UTF-8 +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/1035 -x %HOSTIP:%HTTPPORT +http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%HTTPPORT </command> </client> @@ -50,8 +53,8 @@ http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 ^User-Agent:.* </strip> <protocol> -GET http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1
-Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local
+GET http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1
+Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local
Accept: */*
Proxy-Connection: Keep-Alive
|