From ecd1d020abdae3c3ce3643ddab3106501e62e7c0 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 23 Feb 2017 21:47:17 +0100 Subject: tests: use consistent environment variables for setting charset Character set in POSIX is set by the locale defined (in decreasing order of precedence) by the LC_ALL, LC_CTYPE and LANG environment variables (I believe CHARSET is only historic). 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 overriden, if set. 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 is used (where relevant) to skip the test if UTF-8 isn't in use. Test 1035 was also converted to UTF-8 for consistency, as the actual character set used there is irrelevant to the test. --- tests/data/test2046 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/data/test2046') diff --git a/tests/data/test2046 b/tests/data/test2046 index 0f0eb52c6..135c4dac9 100644 --- a/tests/data/test2046 +++ b/tests/data/test2046 @@ -42,8 +42,12 @@ idn CHARSET=UTF-8 -LANG=en_US.UTF-8 +LC_ALL= +LC_CTYPE=UTF-8 + +perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' + Connection re-use with IDN host name -- cgit v1.2.3