From 0f408599f83f5d8e68f0fb0f765143aa6620651e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 1 Nov 2014 15:13:18 -0700 Subject: 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 Reviewed-by: Andrew Bartlett --- source4/scripting/bin/subunitrun | 2 ++ source4/selftest/tests.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source4') 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") -- cgit v1.2.1