From: Bruno Haible Date: Sat, 31 Mar 2007 20:42:08 +0000 (+0000) Subject: Avoid test failures on OSF/1, AIX, HP-UX, IRIX, Solaris. X-Git-Tag: cvs-readonly~616 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=7b3f796d8690eb44c11493c4a2a544ab2efbb3c4;p=gnulib.git Avoid test failures on OSF/1, AIX, HP-UX, IRIX, Solaris. --- diff --git a/ChangeLog b/ChangeLog index 014c59042..87531f289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-03-31 Bruno Haible + * 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 + * m4/frexpl.m4 (gl_FUNC_FREXPL): Set HAVE_DECL_FREXPL to 0 when the function is not present. diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c index 6717856dc..3d833ac16 100644 --- a/tests/test-striconveha.c +++ b/tests/test-striconveha.c @@ -312,7 +312,7 @@ main () } /* 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 @@ main () 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 @@ main () 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. */