From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Mon, 14 Jul 2008 19:31:33 +0000 (+0000)
Subject: Ignore the error if iconv doesn't support EUC-JP.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3ec443b1887c1bcfe538926e215c528ac0aae3d8;p=dana%2Fcg-glib.git

Ignore the error if iconv doesn't support EUC-JP.

        * tests/iochannel-test.c: Ignore the error if iconv doesn't
        support EUC-JP.


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

diff --git a/ChangeLog b/ChangeLog
index 949ae92b..a48d5944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-14  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 428048 – 2 of 51 tests fail on Solaris
+
+	* tests/iochannel-test.c: Ignore the error if iconv doesn't
+	support EUC-JP.
+
 2008-07-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* tests/option-test.c: Print error messages when something fails.
diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c
index 39b3337a..f08688bc 100644
--- a/tests/iochannel-test.c
+++ b/tests/iochannel-test.c
@@ -91,8 +91,11 @@ gint main (gint argc, gchar * argv[])
     if (gerr)
       {
         g_warning (gerr->message);
+        /* Keep going if this is just a case of iconv not supporting EUC-JP, see bug 428048 */
+        if (gerr->code != G_CONVERT_ERROR_NO_CONVERSION)
+          return 1;
         g_error_free (gerr);
-        return 1;
+        gerr = NULL;
       }
     
     g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);