diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-01 16:36:54 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2014-11-30 16:43:52 +0100 |
| commit | 02e063bd5be06925489f735c51225b65ff961d6b (patch) | |
| tree | 9197174a3a28c52fa69539233ccb340133f52dfc /selftest/selftesthelpers.py | |
| parent | 0f408599f83f5d8e68f0fb0f765143aa6620651e (diff) | |
| download | samba-02e063bd5be06925489f735c51225b65ff961d6b.tar.gz | |
Be consistent about what functions add $LISTOPT and $LOADLIST to the command-line.
Change-Id: Ife86624b53a99d48ce9f00d146b14f798c9bdb24
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Sun Nov 30 16:43:52 CET 2014 on sn-devel-104
Diffstat (limited to 'selftest/selftesthelpers.py')
| -rw-r--r-- | selftest/selftesthelpers.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index b2440054e60..6e387ec9dd3 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -133,9 +133,11 @@ def plantestsuite_loadlist(name, env, cmdline, subunit_version=1): cmdline = " ".join(cmdline) support_list = ("$LISTOPT" in cmdline) if not "$LISTOPT" in cmdline: - raise AssertionError("test %s supports --load-list, but not --list" % name) - print ("%s | %s" % (cmdline, add_prefix(name, env, support_list))).replace("$LISTOPT", "--list") - print cmdline + " $LOADLIST 2>&1 " + to_subunit1(subunit_version) + "| " + add_prefix(name, env, support_list) + raise AssertionError("loadlist test %s does not support not --list" % name) + if not "$LOADLIST" in cmdline: + raise AssertionError("loadlist test %s does not support --load-list" % name) + print ("%s | %s" % (cmdline.replace("$LOADLIST", ""), add_prefix(name, env, support_list))).replace("$LISTOPT", "--list") + print cmdline.replace("$LISTOPT", "") + " 2>&1 " + to_subunit1(subunit_version) + " | " + add_prefix(name, env, False) def skiptestsuite(name, reason): @@ -207,7 +209,7 @@ def plansmbtorture4testsuite(name, env, options, target, modname=None): if isinstance(options, list): options = " ".join(options) options = " ".join(smbtorture4_options + ["--target=%s" % target]) + " " + options - cmdline = "%s $LISTOPT %s %s" % (valgrindify(smbtorture4), options, name) + cmdline = "%s $LISTOPT $LOADLIST %s %s" % (valgrindify(smbtorture4), options, name) plantestsuite_loadlist(modname, env, cmdline) |