From 3ec443b1887c1bcfe538926e215c528ac0aae3d8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Jul 2008 19:31:33 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ tests/iochannel-test.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 949ae92..a48d594 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-07-14 Matthias Clasen + 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 + * tests/option-test.c: Print error messages when something fails. 2008-07-14 Matthias Clasen diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c index 39b3337..f08688b 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); -- 2.7.4