summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-11-01 15:13:18 -0700
committerJelmer Vernooij <jelmer@samba.org>2014-11-30 14:22:05 +0100
commit0f408599f83f5d8e68f0fb0f765143aa6620651e (patch)
treea834d1a492d1047a2a9419890f90637772b08c2b /source4
parentc3855dae71e557b824ad2679acd8bb5ad85936e2 (diff)
downloadsamba-0f408599f83f5d8e68f0fb0f765143aa6620651e.tar.gz
selftest: Add separate command line for listing tests, allowing us of subunit-filter (which doesn't support subunit v2).
Change-Id: Icb877214a422c63fd38ef92425c7b4fe7ee19ad5 Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/scripting/bin/subunitrun2
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 99d53196eea..8d43f259a88 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -81,5 +81,7 @@ opts, args = parser.parse_args()
if not getattr(opts, "listtests", False):
lp = sambaopts.get_loadparm()
samba.tests.cmdline_credentials = credopts.get_credentials(lp)
+if getattr(opts, 'load_list', None):
+ args.insert(0, "--load-list=%s" % opts.load_list)
TestProgram(module=None, args=args, opts=subunitopts)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index ef0d853584e..722e065fc30 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -436,7 +436,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
args += extra_args
if name is None:
name = module
- plantestsuite(name, env, args)
+ plantestsuite_loadlist(name, env, args)
planoldpythontestsuite("dc:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("none", "simple", extra_path=["%s/lib/tdb/python/tests" % srcdir()], name="tdb.python")