summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-10 15:51:45 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-10 15:45:42 +0200
commit86b1f45a5e763893a038bf854dfe735c86f3f30b (patch)
treef7c4303294ed02509c3603fbe064edc624eb78d2
parent142f871cef8f1b239d01d65dfeba3331cff0e166 (diff)
downloadsamba-86b1f45a5e763893a038bf854dfe735c86f3f30b.tar.gz
samba-86b1f45a5e763893a038bf854dfe735c86f3f30b.tar.bz2
samba-86b1f45a5e763893a038bf854dfe735c86f3f30b.zip
lib/util/charset: the comparsion must be against our charset modules
There is little point testing this against the system iconv. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sat Sep 10 15:45:42 CEST 2011 on sn-devel-104
-rw-r--r--lib/util/charset/tests/iconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c
index 62b8d37915..48702e9c50 100644
--- a/lib/util/charset/tests/iconv.c
+++ b/lib/util/charset/tests/iconv.c
@@ -158,14 +158,14 @@ static bool test_buffer(struct torture_context *test,
"failed to open %s to UTF-16LE",
charset));
}
- cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
+ cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", false);
if (cd2 == (iconv_t)-1) {
torture_fail(test,
talloc_asprintf(test,
"failed to open %s to UTF-16LE via smb_iconv_open_ex",
charset));
}
- cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
+ cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, false);
if (cd3 == (iconv_t)-1) {
torture_fail(test,
talloc_asprintf(test,