From d6db8e6cb8e60e82328deda1bb5d940859deb0b7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 18 Oct 2006 23:27:48 +0000 Subject: r19404: fixed the LOCAL-ICONV test (This used to be commit 0b3e83814bdf015064d7dd1f26cf9ec3ddadc7f4) --- source4/torture/local/iconv.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index e41e40dc8d..8d66f4fd58 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -264,7 +264,11 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint) codepoint_t c; size = push_codepoint((char *)buf, codepoint); - torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), "Invalid Codepoint range"); + torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), + "Invalid Codepoint range"); + + if (size == -1) return true; + buf[size] = random(); buf[size+1] = random(); buf[size+2] = random(); @@ -272,8 +276,9 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint) c = next_codepoint((char *)buf, &size2); - torture_assert(tctx, c == codepoint, talloc_asprintf(tctx, - "next_codepoint(%u) failed - gave %u", codepoint, c)); + torture_assert(tctx, c == codepoint, + talloc_asprintf(tctx, + "next_codepoint(%u) failed - gave %u", codepoint, c)); torture_assert(tctx, size2 == size, talloc_asprintf(tctx, "next_codepoint(%u) gave wrong size %d (should be %d)\n", -- cgit