Commit 13314ffd authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

This reverts commit ecd1d020.

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

tests/data/test1034

+0 −5
Original line number Diff line number Diff line
@@ -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>

tests/data/test1035

+4 −8
Original line number Diff line number Diff line
@@ -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-crl-rles-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-crl-rles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1

Host: too-long-IDN-name-crl-rles-la-la-la-dee-da-flooby-nooby.local

Accept: */*

Proxy-Connection: Keep-Alive

tests/data/test165

+1 −5
Original line number Diff line number Diff line
@@ -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>

tests/data/test2046

+1 −5
Original line number Diff line number Diff line
@@ -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>

tests/data/test2047

+1 −5
Original line number Diff line number Diff line
@@ -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>