glib r7180 - in trunk: . tests

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jul 14 18:17:20 2008
New Revision: 7180
URL: http://svn.gnome.org/viewvc/glib?rev=7180&view=rev

Log:
Skip a test if iconv doesn't support the encoding


Modified:
   trunk/ChangeLog
   trunk/tests/convert-test.c

Modified: trunk/tests/convert-test.c
==============================================================================
--- trunk/tests/convert-test.c	(original)
+++ trunk/tests/convert-test.c	Mon Jul 14 18:17:20 2008
@@ -44,7 +44,10 @@
 
   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);