[PATCH 3/8] Don't import into testr when --load-list was specified, as testr will take care of that itself.

[Matthieu Patou]

On Sun, Oct 12, 2014 at 09:18:59PM -0700, Jelmer Vernooij wrote:
> Change-Id: I3d57f4cfafdd48751dfbd145f220dc5cf000ec3f
> Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
> ---
>  selftest/wscript | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/selftest/wscript b/selftest/wscript
> index f2520c3..b7655f2 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)
> -- 
> 2.1.1
> 
Reviewed-By: Matthieu Patou <mat at matws.net>

-- 
Matthieu Patou
Samba Team
http://samba.org