sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

Don't import into testr when --load-list was specified, as testr will

Browse Source 
take care of that itself.

Change-Id: I3d57f4cfafdd48751dfbd145f220dc5cf000ec3f
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jelmer Vernooij 2014-10-12 17:58:41 -07:00 committed by Andrew Bartlett
parent 7cc7093fb3
commit b2e4f312a2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
selftest/wscript
View File

@ -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)