[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/2] tests/docker/Makefile.include: handle empty TARG
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 1/2] tests/docker/Makefile.include: handle empty TARGET_LIST |
Date: |
Mon, 4 Jun 2018 15:10:49 +0800 |
From: Alex Bennée <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
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 31f21a43f5..9d5749887a 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -140,7 +140,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