Skip a test if iconv doesn't support the encoding

svn path=/trunk/; revision=7180

diff --git a/ChangeLog b/ChangeLog
index 1e1215bea7b67274b359d41c261e0a3c8fbfa7c9..ff49aab93ba7fe163f222a69219148ba703cbc0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-14  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 467707 – test_iconv_state() in tests/convert-test.c fails on AIX 5.3
+
+       * tests/convert-test.c (test_iconv_state): Skip this test if
+       CP1255 is not supported.  
+
 2008-07-10  Ryan Lortie  <desrt@desrt.ca>
 
        * docs/reference/glib/glib-sections.txt:

diff --git a/tests/convert-test.c b/tests/convert-test.c
index 3ea3a6602ad83a4f0a7f53f7223364f0d23996d1..f21972737de0e671aca1bfbc79635590adba862c 100644 (file)
--- a/tests/convert-test.c
+++ b/tests/convert-test.c
@@ -44,7 +44,10 @@ test_iconv_state (void)
 
   out = g_convert (in, -1, "UTF-8", "CP1255", 
                   &bytes_read, &bytes_written, &error);
-  
+
+  if (error && error->code == G_CONVERT_ERROR_NO_CONVERSION)
+    return; /* silently skip if CP1255 is not supported, see bug 467707 */ 
+
   g_assert (error == NULL);
   g_assert (bytes_read == 5);
   g_assert (bytes_written == 10);