From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 14/16] tests/Makefile.include: don't use TARGET_DIRS for check-tcg
Date: Mon, 8 Feb 2021 12:38:19 +0000 [thread overview]
Message-ID: <20210208123821.19818-15-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org>
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>
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
next prev parent reply other threads:[~2021-02-08 19:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 12:38 [PULL 00/16] testing, gdbstub and doc tweaks Alex Bennée
2021-02-08 12:38 ` [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests Alex Bennée
2021-02-08 12:38 ` [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image Alex Bennée
2021-02-08 12:38 ` [PULL 03/16] tests/docker: Fix typo in help message Alex Bennée
2021-02-08 12:38 ` [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files Alex Bennée
2021-02-08 12:38 ` [PULL 05/16] tests/docker: preserve original name when copying libs Alex Bennée
2021-02-08 12:38 ` [PULL 06/16] tests/docker: alias docker-help target for consistency Alex Bennée
2021-02-08 12:38 ` [PULL 07/16] tests/docker: add a docker-exec-copy-test Alex Bennée
2021-02-08 12:38 ` [PULL 08/16] configure: make version_ge more tolerant of shady version input Alex Bennée
2021-02-08 12:38 ` [PULL 09/16] configure: bump the minimum gdb version for check-tcg to 9.1 Alex Bennée
2021-02-08 12:38 ` [PULL 10/16] tests/tcg: don't silently skip the gdb tests Alex Bennée
2021-02-08 12:38 ` [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv Alex Bennée
2021-02-08 12:38 ` [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS) Alex Bennée
2021-02-08 12:38 ` [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it Alex Bennée
2021-02-08 12:38 ` Alex Bennée [this message]
2021-02-08 12:38 ` [PULL 15/16] docs/system: document an example vexpress-a15 invocation Alex Bennée
2021-02-08 12:38 ` [PULL 16/16] docs/system: document an example booting the versatilepb machine Alex Bennée
2021-02-08 16:12 ` [PULL 00/16] testing, gdbstub and doc tweaks Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210208123821.19818-15-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).