[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 13/15] tests/Makefile.include: don't use TARGET_DIRS for check
From: |
Alex Bennée |
Subject: |
[PATCH v1 13/15] tests/Makefile.include: don't use TARGET_DIRS for check-tcg |
Date: |
Tue, 2 Feb 2021 13:39:58 +0000 |
TARGET_DIRS reflects what we wanted to configure which in the normal
case is all our targets. However once meson has pared-down our target
list due to missing features we need to check the final list of
ninja-targets. This prevents check-tcg barfing on a --disable-tcg
build.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210126145356.7860-3-alex.bennee@linaro.org>
---
v2
- move everything to Makefile.include
---
tests/Makefile.include | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 17dafdfe98..d34254fb29 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -40,11 +40,13 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
SPEED = quick
-# Per guest TCG tests
+# Build up our target list from the filtered list of ninja targets
+TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets)))
-BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
-CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS))
-RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS))
+# Per guest TCG tests
+BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGETS))
+CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGETS))
+RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGETS))
# Probe for the Docker Builds needed for each build
$(foreach PROBE_TARGET,$(TARGET_DIRS), \
--
2.20.1
- [PATCH v1 09/15] tests/tcg: don't silently skip the gdb tests, (continued)
- [PATCH v1 12/15] scripts/mtest2make.py: export all-%s-targets variable and use it, Alex Bennée, 2021/02/02
- [PATCH v1 10/15] gdbstub: Fix handle_query_xfer_auxv, Alex Bennée, 2021/02/02
- [PATCH v1 13/15] tests/Makefile.include: don't use TARGET_DIRS for check-tcg,
Alex Bennée <=
- [PATCH v1 15/15] docs/system: document an example booting the versatilepb machine, Alex Bennée, 2021/02/02
- [PATCH v1 14/15] docs/system: document an example vexpress-a15 invocation, Alex Bennée, 2021/02/02