Revert "tests: use consistent environment variables for setting charset"

This reverts commit ecd1d020abdae3c3ce3643ddab3106501e62e7c0.

That commit caused test failures on my Debian Linux machine for all
changed test cases. We need to reconsider how that should get done.

diff --git a/tests/data/test1034 b/tests/data/test1034
index 4bddf59bbb2418f40e2b79189e9c970772494ec4..c47574051328a2808fb1195be45342da2a97364b 100644 (file)
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -33,12 +33,7 @@ idn
 </features>
 <setenv>
 CHARSET=UTF-8
-LC_ALL=
-LC_CTYPE=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 1be22a84a5c682d95d374a3e04cb971a15dd497b..05172ec9a0421143d2509dbf3eabc2e13eafd67c 100644 (file)
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -33,17 +33,13 @@ idn
 </features>
 <setenv>
 CHARSET=UTF-8
-LC_ALL=
-LC_CTYPE=UTF-8
+LANG=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>
 
@@ -54,8 +50,8 @@ http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/10
 ^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\r
-Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local\r
+GET http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1\r
+Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test165 b/tests/data/test165
index 4d48c0c656dc1cc08fbfea5479f2b89a5be1acf5..6fc0ad2d572dcbf80a5018e5204b878296870170 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -32,12 +32,8 @@ idn
 </features>
 <setenv>
 CHARSET=UTF-8
-LC_ALL=
-LC_CTYPE=UTF-8
+LANG=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 135c4dac9b28c2712fe99d18e699196559fd5fb9..0f0eb52c672c581ee4aa5607032edb217f2aedcb 100644 (file)
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -42,12 +42,8 @@ idn
 </features>
 <setenv>
 CHARSET=UTF-8
-LC_ALL=
-LC_CTYPE=UTF-8
+LANG=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 re-use with IDN host name
  </name>

diff --git a/tests/data/test2047 b/tests/data/test2047
index e5c122d1bb347022a57edbf730b7a001c25b2f65..f54a30af658ea54642e49ee10de4f3308b214d47 100644 (file)
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -43,12 +43,8 @@ idn
 </features>
 <setenv>
 CHARSET=UTF-8
-LC_ALL=
-LC_CTYPE=UTF-8
+LANG=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 re-use with IDN host name over HTTP proxy
  </name>