From: Bruno Haible <bruno@clisp.org>
Date: Thu, 19 Dec 2019 05:15:56 +0000 (+0100)
Subject: iconv tests: Test canonicalized, not system-dependent, encoding names.
X-Git-Tag: v1.0~4473
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=994dc96ebaf820197db500cfec0b3da346bc2385;p=thirdparty%2Fgnulib.git

iconv tests: Test canonicalized, not system-dependent, encoding names.

* tests/test-iconv.c (main): Revert part of the 2016-08-17 patch.
---

diff --git a/ChangeLog b/ChangeLog
index cd062159ae..25108848e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-19  Bruno Haible  <bruno@clisp.org>
+
+	iconv tests: Test canonicalized, not system-dependent, encoding names.
+	* tests/test-iconv.c (main): Revert part of the 2016-08-17 patch.
+
 2019-12-18  Bruno Haible  <bruno@clisp.org>
 
 	localename: Fix test failure on AIX 7.2.
diff --git a/tests/test-iconv.c b/tests/test-iconv.c
index 3fe9e30655..ef1e681661 100644
--- a/tests/test-iconv.c
+++ b/tests/test-iconv.c
@@ -44,8 +44,8 @@ main ()
 #if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      and UTF-8.  */
-  iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO8859-1");
-  iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+  iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+  iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8");
 
 #if defined __MVS__ && defined __IBMC__
   /* String literals below are in ASCII, not EBCDIC.  */