Mercurial > hg > octave-lojdl > gnulib-hg

changeset 8602:14e648f874bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid test failures on OSF/1, AIX, HP-UX, IRIX, Solaris.
author Bruno Haible <bruno@clisp.org>
date Sat, 31 Mar 2007 20:42:08 +0000
parents a5c2fa01c945
children 4aea800039c0
files ChangeLog tests/test-striconveha.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-31  Bruno Haible  <bruno@clisp.org>
+
+	* tests/test-striconveha.c (main): Don't expect "autodetect_jp" to
+	work on Solaris either. Protect also second use of "autodetect_jp".
+
 2007-03-31  Bruno Haible  <bruno@clisp.org>
 
 	* m4/frexpl.m4 (gl_FUNC_FREXPL): Set HAVE_DECL_FREXPL to 0 when
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -312,7 +312,7 @@
     }
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
-# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__)
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
   /* Test conversions from autodetect_jp to UTF-8.  */
   for (h = 0; h < SIZEOF (handlers); h++)
     {
@@ -547,6 +547,8 @@
       free (result);
     }
 
+  /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
   /* Test conversions from autodetect_jp to UTF-8.  */
   for (h = 0; h < SIZEOF (handlers); h++)
     {
@@ -578,6 +580,7 @@
       ASSERT (strcmp (result, expected) == 0);
       free (result);
     }
+# endif
 
 # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
   /* Test conversion from UTF-8 to ISO-8859-1 with transliteration.  */