diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-19 19:13:21 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-20 06:27:06 +0200 |
| commit | f9acf770e9c121aa495cb7e19175a4a6e45ff3d9 (patch) | |
| tree | b64283a8a0f929f28de73f84ef207f5f5018f8f9 /lib/util/charset/tests/iconv.c | |
| parent | 8316577b7538f7204c5fd6328756c4c3f171b36e (diff) | |
| download | samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.gz samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.xz samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.zip | |
lib/util/charset: remove charset module loading
Now that the 'table' modules are gone, there is no reason for there to
be charset modules at all. This builds the macosxfs and weird modules
into the binary at the appropriate times, and changes the tests to
test instead the difference between the remaining internal handlers
and iconv().
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Sep 20 06:27:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/util/charset/tests/iconv.c')
| -rw-r--r-- | lib/util/charset/tests/iconv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/util/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c index 48702e9c508..67045410161 100644 --- a/lib/util/charset/tests/iconv.c +++ b/lib/util/charset/tests/iconv.c @@ -35,9 +35,6 @@ static bool iconv_untestable(struct torture_context *tctx) { iconv_t cd; - if (!lpcfg_parm_bool(tctx->lp_ctx, NULL, "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"); @@ -158,14 +155,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", false); + cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "use_builtin_handlers", true)); 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, false); + cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "use_builtin_handlers", true)); if (cd3 == (iconv_t)-1) { torture_fail(test, talloc_asprintf(test, |