svn commit: samba r24685 - in branches/SAMBA_4_0: .
source/torture/local
jelmer at samba.org
jelmer at samba.org
Sun Aug 26 22:15:45 GMT 2007
Author: jelmer
Date: 2007-08-26 22:15:44 +0000 (Sun, 26 Aug 2007)
New Revision: 24685
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24685
Log:
Don't warn about iconv tests not being usable until they're actually being run.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/local/iconv.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/torture/local/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/iconv.c 2007-08-26 22:12:02 UTC (rev 24684)
+++ branches/SAMBA_4_0/source/torture/local/iconv.c 2007-08-26 22:15:44 UTC (rev 24685)
@@ -28,6 +28,27 @@
#include "torture/util.h"
#if HAVE_NATIVE_ICONV
+
+static bool iconv_untestable(struct torture_context *tctx)
+{
+ iconv_t cd;
+
+ if (!lp_parm_bool(-1, "iconv", "native", true))
+ torture_skip(tctx, "system iconv disabled - skipping test");
+
+ cd = iconv_open("UTF-16LE", "UCS-4LE");
+ if (cd == (iconv_t)-1)
+ torture_skip(tctx, "unable to test - system iconv library does not support UTF-16LE -> UCS-4LE");
+ iconv_close(cd);
+
+ cd = iconv_open("UTF-16LE", "CP850");
+ if (cd == (iconv_t)-1)
+ torture_skip(tctx, "unable to test - system iconv library does not support UTF-16LE -> CP850\n");
+ iconv_close(cd);
+
+ return false;
+}
+
/*
generate a UTF-16LE buffer for a given unicode codepoint
*/
@@ -292,6 +313,9 @@
static bool test_next_codepoint(struct torture_context *tctx)
{
+ if (iconv_untestable(tctx))
+ return true;
+
unsigned int codepoint;
for (codepoint=0;codepoint<(1<<20);codepoint++) {
if (!test_codepoint(tctx, codepoint))
@@ -306,6 +330,9 @@
size_t size;
unsigned char inbuf[1000];
+ if (iconv_untestable(tctx))
+ return true;
+
for (codepoint=0;codepoint<(1<<20);codepoint++) {
if (gen_codepoint_utf16(codepoint, (char *)inbuf, &size) != 0) {
continue;
@@ -328,6 +355,10 @@
{
unsigned char inbuf[1000];
unsigned int i;
+
+ if (iconv_untestable(tctx))
+ return true;
+
for (i=0;i<500000;i++) {
size_t size;
unsigned int c;
@@ -368,30 +399,8 @@
struct torture_suite *torture_local_iconv(TALLOC_CTX *mem_ctx)
{
- static iconv_t cd;
struct torture_suite *suite = torture_suite_create(mem_ctx, "ICONV");
- if (!lp_parm_bool(-1, "iconv", "native", True)) {
- printf("system iconv disabled - skipping test\n");
- return NULL;
- }
-
- cd = iconv_open("UTF-16LE", "UCS-4LE");
- if (cd == (iconv_t)-1) {
- printf("unable to test - system iconv library does not support UTF-16LE -> UCS-4LE\n");
- return NULL;
- }
- iconv_close(cd);
-
- cd = iconv_open("UTF-16LE", "CP850");
- if (cd == (iconv_t)-1) {
- printf("unable to test - system iconv library does not support UTF-16LE -> CP850\n");
- return NULL;
- }
- iconv_close(cd);
-
- srandom(time(NULL));
-
torture_suite_add_simple_test(suite, "next_codepoint()",
test_next_codepoint);
More information about the samba-cvs
mailing list