]> Savannah Git Hosting - gnulib.git/commitdiff
iconv tests: Test canonicalized, not system-dependent, encoding names.
authorBruno Haible <bruno@clisp.org>
Thu, 19 Dec 2019 05:15:56 +0000 (06:15 +0100)
committerBruno Haible <bruno@clisp.org>
Thu, 19 Dec 2019 05:15:56 +0000 (06:15 +0100)
* tests/test-iconv.c (main): Revert part of the 2016-08-17 patch.

ChangeLog
tests/test-iconv.c

index cd062159ae0c4724a5054f47093ea895b536f538..25108848e3674dd16dc2b946ac700acc9ec523fd 100644 (file)
--- 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.
index 3fe9e30655b5793eaa4a7c63900413ab1cf17f0d..ef1e6816614b0ca44cde111cb52c1991824a4de9 100644 (file)
@@ -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.  */