summaryrefslogtreecommitdiff
path: root/source4/selftest/tests.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-19 19:13:21 -0700
committerAndrew Bartlett <abartlet@samba.org>2011-09-20 06:27:06 +0200
commitf9acf770e9c121aa495cb7e19175a4a6e45ff3d9 (patch)
treeb64283a8a0f929f28de73f84ef207f5f5018f8f9 /source4/selftest/tests.py
parent8316577b7538f7204c5fd6328756c4c3f171b36e (diff)
downloadsamba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.gz
samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.bz2
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 'source4/selftest/tests.py')
-rwxr-xr-xsource4/selftest/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 60e16a5d16..5b008a0e9d 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -273,9 +273,9 @@ for t in smb4torture_testsuites("local."):
# Confirm these tests with the system iconv too
for t in ["local.convert_string_handle", "local.convert_string", "local.ndr"]:
- modname = "samba4.%s.iconv.modules" % t
- cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:native=false'", t)
- plantestsuite_loadlist(modname, env, cmdline)
+ modname = "samba4.%s.system.iconv" % t
+ cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:use_builtin_handlers=false'", t)
+ plantestsuite_loadlist(modname, "none", cmdline)
tdbtorture4 = binpath("tdbtorture")
if os.path.exists(tdbtorture4):