diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-10-12 17:58:41 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-14 06:44:07 +0200 |
| commit | b2e4f312a2680f314ccd9a9d294e50035f117e07 (patch) | |
| tree | b2abbd3c8c4aff3fffdccfd719f0b2add8b7cf6a /selftest/wscript | |
| parent | 7cc7093fb3f52e438239578e70aaee6c3ef12cda (diff) | |
| download | samba-b2e4f312a2680f314ccd9a9d294e50035f117e07.tar.gz samba-b2e4f312a2680f314ccd9a9d294e50035f117e07.tar.xz samba-b2e4f312a2680f314ccd9a9d294e50035f117e07.zip | |
Don't import into testr when --load-list was specified, as testr will
take care of that itself.
Change-Id: I3d57f4cfafdd48751dfbd145f220dc5cf000ec3f
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/wscript')
| -rw-r--r-- | selftest/wscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/selftest/wscript b/selftest/wscript index f2520c3293..b7655f247e 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -221,7 +221,9 @@ def cmd_testonly(opt): print("test: running %s" % runcmd) ret = RUN_COMMAND(cmd, env=env) - if os.path.exists(".testrepository") and not Options.options.LIST: + if (os.path.exists(".testrepository") and + not Options.options.LIST and + not Options.options.LOAD_LIST): testrcmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null' runcmd = EXPAND_VARIABLES(opt, testrcmd) RUN_COMMAND(runcmd, env=env) |