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>

diff --git a/selftest/wscript b/selftest/wscript
index f2520c3293ac094877bd6d21192519ea87dbd519..b7655f247e9b3e38a96cbdc17e3f1cb693ad4ac7 100644 (file)
--- 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)