From 052f3e6bd9a4f535d9376d35205fa52f702be49b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Jul 2008 18:17:20 +0000 Subject: [PATCH] Skip a test if iconv doesn't support the encoding svn path=/trunk/; revision=7180 --- ChangeLog | 7 +++++++ tests/convert-test.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e1215b..ff49aab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-14 Matthias Clasen + + 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 * docs/reference/glib/glib-sections.txt: diff --git a/tests/convert-test.c b/tests/convert-test.c index 3ea3a66..f219727 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); -- 2.7.4