qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] tests/docker/Makefile.include: handle empty TAR


From: Fam Zheng
Subject: Re: [Qemu-devel] [PATCH] tests/docker/Makefile.include: handle empty TARGET_LIST
Date: Mon, 21 May 2018 11:21:39 +0800
User-agent: Mutt/1.9.2 (2017-12-15)

On Fri, 05/18 16:22, Alex Bennée wrote:
> If the user doesn't specify a TARGET_LIST they get the current
> configuration but with spaces and hilarity ensues. This adds some make
> magic to turn the TARGET_LIST back into a comma separated list.
> 
> Signed-off-by: Alex Bennée <address@hidden>
> ---
>  tests/docker/Makefile.include | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index d00887bdf1..eccd5f7d68 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -125,6 +125,10 @@ docker:
>       @echo '    EXTRA_FILES="<path> [... <path>]"'
>       @echo '                         Include extra files in image.'
>  
> +null  :=
> +space := $(null) #
> +comma := ,

We have $(COMMA) in rules.mak, please add space there.

> +
>  # This rule if for directly running against an arbitrary docker target.
>  # It is called by the expanded docker targets (e.g. make
>  # address@hidden) which will do additional verification.
> @@ -148,7 +152,7 @@ docker-run: docker-qemu-src
>                       $(if $V,,--rm)                                  \
>                       $(if $(DEBUG),-ti,)                             \
>                       $(if $(NETWORK),$(if $(subst 
> $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
> -                     -e TARGET_LIST=$(TARGET_LIST)                   \
> +                     -e TARGET_LIST=$(subst 
> $(space),$(comma),$(TARGET_LIST))        \
>                       -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
>                       -e V=$V -e J=$J -e DEBUG=$(DEBUG)               \
>                       -e SHOW_ENV=$(SHOW_ENV)                         \
> -- 
> 2.17.0
> 

Fam



reply via email to

[Prev in Thread] Current Thread [Next in Thread]