qemu-devel
[Top][All Lists]
Advanced

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

[Qemu-devel] [PATCH v2] tests/docker/Makefile.include: handle empty TARG


From: Alex Bennée
Subject: [Qemu-devel] [PATCH v2] tests/docker/Makefile.include: handle empty TARGET_LIST
Date: Mon, 21 May 2018 11:35:04 +0100

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>

---
v2
  - use common $(SPACE) and $(COMMA) in rules.mak
---
 rules.mak                     | 3 +++
 tests/docker/Makefile.include | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules.mak b/rules.mak
index 04c7f74d07..bbb2667928 100644
--- a/rules.mak
+++ b/rules.mak
@@ -1,4 +1,7 @@
 
+# These are used when we want to do substitutions without confusing Make
+NULL  :=
+SPACE := $(NULL) #
 COMMA := ,
 
 # Don't use implicit rules or variables
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index d00887bdf1..e911d44d9f 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -148,7 +148,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




reply via email to

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