[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 04/205: tests: use consistent environment variables
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 04/205: tests: use consistent environment variables for setting charset |
Date: |
Thu, 20 Apr 2017 16:19:04 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit c6ddb606d8a3fdbe89763f7299e7f43cf6581567
Author: Dan Fandrich <address@hidden>
AuthorDate: Thu Feb 23 21:47:17 2017 +0100
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).
---
tests/data/test1034 | 6 +++++-
tests/data/test1035 | 13 ++++++++-----
tests/data/test165 | 7 +++++--
tests/data/test2046 | 7 +++++--
tests/data/test2047 | 7 +++++--
5 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/tests/data/test1034 b/tests/data/test1034
index c47574051..063f52b32 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -32,8 +32,12 @@ http
idn
</features>
<setenv>
-CHARSET=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 malformatted IDN host name
</name>
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
^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 6fc0ad2d5..b9a1ed786 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -31,9 +31,12 @@ 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 IDN host name
</name>
diff --git a/tests/data/test2046 b/tests/data/test2046
index 0f0eb52c6..dcd202f04 100644
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -41,9 +41,12 @@ 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>
Connection re-use with IDN host name
</name>
diff --git a/tests/data/test2047 b/tests/data/test2047
index f54a30af6..fc140486b 100644
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -42,9 +42,12 @@ 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>
Connection re-use with IDN host name over HTTP proxy
</name>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 12/205: cyassl: get library version string at runtime, (continued)
- [GNUnet-SVN] [gnurl] 12/205: cyassl: get library version string at runtime, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 09/205: gopher: fixed detection of an error condition from Curl_urldecode, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 10/205: url: fix unix-socket support for proxy-disabled builds, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 05/205: proxy: fixed a memory leak on OOM, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 13/205: digest_sspi: fix compilation warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 11/205: test1139: allow for the possibility that the man page is not rebuilt, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 06/205: ftp: removed an erroneous free in an OOM path, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 01/205: bump: work on the next release, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 02/205: cmake: Replace invalid UTF-8 byte sequence, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 03/205: test557: explicitly use the C locale so the numeric output is as expected, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 04/205: tests: use consistent environment variables for setting charset,
gnunet <=
- [GNUnet-SVN] [gnurl] 16/205: darwinssl: Warn that disabling host verify also disables SNI, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 08/205: ftp: fixed a NULL pointer dereference on OOM, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 14/205: tests: enable HTTP/2 tests to run with non-default port numbers, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 15/205: warnless: suppress compiler warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 20/205: configure: fix --with-zlib when a path is specified, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 32/205: BINDINGS: add misssing C++ bindings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 29/205: CMake: Add mbedTLS support, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 25/205: fix potential use of uninitialized variables, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 35/205: BINDINGS: update the Lua-cURL URL, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 17/205: configure: fix for --enable-pthreads, gnunet, 2017/04/20