Mercurial > hg > octave-kai > gnulib-hg
changeset 8585:0290e58a0863
Avoid test failures on OSF/1, IRIX, HP-UX, AIX.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Thu, 29 Mar 2007 23:05:45 +0000 |
parents | 4d6fd426d412 |
children | 1b8abd967723 |
files | tests/test-striconveh.c tests/test-striconveha.c tests/uniconv/test-u16-conv-from-enc.c tests/uniconv/test-u16-strconv-from-enc.c tests/uniconv/test-u32-conv-from-enc.c tests/uniconv/test-u32-strconv-from-enc.c tests/uniconv/test-u8-conv-from-enc.c tests/uniconv/test-u8-strconv-from-enc.c |
diffstat | 8 files changed, 25 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-striconveh.c +++ b/tests/test-striconveh.c @@ -64,8 +64,6 @@ iconv_t cd_88592_to_utf8 = iconv_open ("UTF-8", "ISO-8859-2"); iconv_t cd_utf8_to_88592 = iconv_open ("ISO-8859-2", "UTF-8"); - ASSERT (cd_88591_to_88592 != (iconv_t)(-1)); - ASSERT (cd_88592_to_88591 != (iconv_t)(-1)); ASSERT (cd_88591_to_utf8 != (iconv_t)(-1)); ASSERT (cd_utf8_to_88591 != (iconv_t)(-1)); ASSERT (cd_88592_to_utf8 != (iconv_t)(-1)); @@ -457,8 +455,10 @@ free (result); } - iconv_close (cd_88591_to_88592); - iconv_close (cd_88592_to_88591); + if (cd_88591_to_88592 != (iconv_t)(-1)) + iconv_close (cd_88591_to_88592); + if (cd_88592_to_88591 != (iconv_t)(-1)) + iconv_close (cd_88592_to_88591); iconv_close (cd_88591_to_utf8); iconv_close (cd_utf8_to_88591); iconv_close (cd_88592_to_utf8);
--- a/tests/test-striconveha.c +++ b/tests/test-striconveha.c @@ -311,6 +311,8 @@ } } + /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ +# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__) /* Test conversions from autodetect_jp to UTF-8. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -402,6 +404,7 @@ 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. */
--- a/tests/uniconv/test-u16-conv-from-enc.c +++ b/tests/uniconv/test-u16-conv-from-enc.c @@ -122,6 +122,8 @@ } } + /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ +# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__) /* Test conversions from autodetect_jp to UTF-16. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -219,6 +221,7 @@ free (result); } } +# endif #endif
--- a/tests/uniconv/test-u16-strconv-from-enc.c +++ b/tests/uniconv/test-u16-strconv-from-enc.c @@ -74,6 +74,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__) /* Test conversions from autodetect_jp to UTF-16. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -114,6 +116,7 @@ ASSERT (u16_strcmp (result, expected) == 0); free (result); } +# endif #endif
--- a/tests/uniconv/test-u32-conv-from-enc.c +++ b/tests/uniconv/test-u32-conv-from-enc.c @@ -122,6 +122,8 @@ } } + /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ +# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__) /* Test conversions from autodetect_jp to UTF-16. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -219,6 +221,7 @@ free (result); } } +# endif #endif
--- a/tests/uniconv/test-u32-strconv-from-enc.c +++ b/tests/uniconv/test-u32-strconv-from-enc.c @@ -74,6 +74,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__) /* Test conversions from autodetect_jp to UTF-16. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -114,6 +116,7 @@ ASSERT (u32_strcmp (result, expected) == 0); free (result); } +# endif #endif
--- a/tests/uniconv/test-u8-conv-from-enc.c +++ b/tests/uniconv/test-u8-conv-from-enc.c @@ -117,6 +117,8 @@ } } + /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ +# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__) /* Test conversions from autodetect_jp to UTF-8. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -205,6 +207,7 @@ free (result); } } +# endif #endif
--- a/tests/uniconv/test-u8-strconv-from-enc.c +++ b/tests/uniconv/test-u8-strconv-from-enc.c @@ -65,6 +65,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__) /* Test conversions from autodetect_jp to UTF-8. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -96,6 +98,7 @@ ASSERT (u8_strcmp (result, expected) == 0); free (result); } +# endif #endif