From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Mon, 14 Jul 2008 18:17:20 +0000 (+0000)
Subject: Skip a test if iconv doesn't support the encoding
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=052f3e6bd9a4f535d9376d35205fa52f702be49b;p=dana%2Fcg-glib.git

Skip a test if iconv doesn't support the encoding

svn path=/trunk/; revision=7180
---

diff --git a/ChangeLog b/ChangeLog
index 1e1215be..ff49aab9 100644
--- 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 3ea3a660..f2197273 100644
--- 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);