summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-14 01:54:26 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-14 15:49:36 +0100
commit6321d5bf9764929c7bb8c39f7461759776b7739a (patch)
tree2d3aae3e91e9dde88ec5e619167032d111b64d1d /source4/selftest
parent11a77fe2d7b9ff3edd2e095acff8fdad03b35b50 (diff)
downloadsamba-6321d5bf9764929c7bb8c39f7461759776b7739a.tar.gz
samba-6321d5bf9764929c7bb8c39f7461759776b7739a.tar.bz2
samba-6321d5bf9764929c7bb8c39f7461759776b7739a.zip
s4-tests: Allow listing tests run for iconv.
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/tests.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 0a1ff7a1a7..7715e96caa 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -33,8 +33,9 @@ if validate:
else:
validate_list = []
-def plansmbtorturetestsuite(name, env, options):
- modname = "samba4.%s" % name
+def plansmbtorturetestsuite(name, env, options, modname=None):
+ if modname is None:
+ modname = "samba4.%s" % name
cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
plantestsuite_loadlist(modname, env, cmdline)
@@ -274,9 +275,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.system.iconv" % t
- cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc: --option='iconv:use_builtin_handlers=false'", t)
- plantestsuite_loadlist(modname, "none", cmdline)
+ options = "ncalrpc: --option='iconv:use_builtin_handlers=false'"
+ plansmbtorturetestsuite(t, "none", options,
+ modname="samba4.%s.system.iconv" % t)
tdbtorture4 = binpath("tdbtorture")
if os.path.exists(tdbtorture4):