diff options
| author | Alex Bennée | 2021-02-02 14:39:58 +0100 |
|---|---|---|
| committer | Alex Bennée | 2021-02-08 11:55:20 +0100 |
| commit | c401c058a1cdb131163751f29df9151290d842b0 (patch) | |
| tree | 7fa923455f078ae7892c0c08d4361dffa9254148 /tests/Makefile.include | |
| parent | scripts/mtest2make.py: export all-%s-targets variable and use it (diff) | |
| download | qemu-c401c058a1cdb131163751f29df9151290d842b0.tar.gz qemu-c401c058a1cdb131163751f29df9151290d842b0.tar.xz qemu-c401c058a1cdb131163751f29df9151290d842b0.zip | |
tests/Makefile.include: don't use TARGET_DIRS for check-tcg
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: <20210202134001.25738-14-alex.bennee@linaro.org>
Diffstat (limited to 'tests/Makefile.include')
| -rw-r--r-- | tests/Makefile.include | 10 |
1 files 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), \ |