* [Qemu-devel] [PATCH] tests/docker/Makefile.include: handle empty TARGET_LIST
@ 2018-05-18 15:22 Alex Bennée
2018-05-21 3:21 ` Fam Zheng
0 siblings, 1 reply; 2+ messages in thread
From: Alex Bennée @ 2018-05-18 15:22 UTC (permalink / raw)
To: famz; +Cc: qemu-devel, Alex Bennée, Philippe Mathieu-Daudé
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 <alex.bennee@linaro.org>
---
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 := ,
+
# This rule if for directly running against an arbitrary docker target.
# It is called by the expanded docker targets (e.g. make
# docker-test-foo@bar) 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] tests/docker/Makefile.include: handle empty TARGET_LIST
2018-05-18 15:22 [Qemu-devel] [PATCH] tests/docker/Makefile.include: handle empty TARGET_LIST Alex Bennée
@ 2018-05-21 3:21 ` Fam Zheng
0 siblings, 0 replies; 2+ messages in thread
From: Fam Zheng @ 2018-05-21 3:21 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel, Philippe Mathieu-Daudé
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 <alex.bennee@linaro.org>
> ---
> 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
> # docker-test-foo@bar) 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-21 3:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-18 15:22 [Qemu-devel] [PATCH] tests/docker/Makefile.include: handle empty TARGET_LIST Alex Bennée
2018-05-21 3:21 ` Fam Zheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).