svn commit: samba r19404 - in branches/SAMBA_4_0/source/torture/local: .

[tridge at samba.org]

Author: tridge
Date: 2006-10-18 23:27:48 +0000 (Wed, 18 Oct 2006)
New Revision: 19404

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19404

Log:

fixed the LOCAL-ICONV test

Modified:
   branches/SAMBA_4_0/source/torture/local/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/local/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/iconv.c	2006-10-18 22:33:20 UTC (rev 19403)
+++ branches/SAMBA_4_0/source/torture/local/iconv.c	2006-10-18 23:27:48 UTC (rev 19404)
@@ -264,7 +264,11 @@
 	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 @@
 
 	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",