From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 24 Feb 2017 07:41:36 +0000 (+0100)
Subject: Revert "tests: use consistent environment variables for setting charset"
X-Git-Tag: curl-7_53_1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13314ffd65c5b7386d041be8111b90e1d150e117;p=thirdparty%2Fcurl.git

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 4bddf59bbb..c475740513 100644
--- 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 1be22a84a5..05172ec9a0 100644
--- 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
-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
 
diff --git a/tests/data/test165 b/tests/data/test165
index 4d48c0c656..6fc0ad2d57 100644
--- 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 135c4dac9b..0f0eb52c67 100644
--- 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 e5c122d1bb..f54a30af65 100644
--- 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>