From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Manos Pitsidianakis" <manos.pitsidianakis@linaro.org>
Subject: [PATCH for 10.1 v2 09/14] tests/tcg: don't include multiarch tests if not supported
Date: Fri, 25 Jul 2025 16:45:12 +0100 [thread overview]
Message-ID: <20250725154517.3523095-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250725154517.3523095-1-alex.bennee@linaro.org>
We are about to change the way the plugin runs are done and having
this included by default will complicate things.
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/Makefile.target | 6 ++++++
tests/tcg/multiarch/system/Makefile.softmmu-target | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index 97ebe8f9bc9..a12b15637ea 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -127,8 +127,14 @@ else
# build options for bare programs are usually pretty different. They
# are expected to provide their own build recipes.
EXTRA_CFLAGS += -ffreestanding -fno-stack-protector
+
+# We skip the multiarch tests if the target hasn't provided a boot.S
+MULTIARCH_SOFTMMU_TARGETS = i386 alpha aarch64 arm loongarch64 s390x x86_64
+
+ifneq ($(filter $(TARGET_NAME),$(MULTIARCH_SOFTMMU_TARGETS)),)
-include $(SRC_PATH)/tests/tcg/minilib/Makefile.target
-include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target
+endif
-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target
endif
diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target
index 07be001102b..5acf2700812 100644
--- a/tests/tcg/multiarch/system/Makefile.softmmu-target
+++ b/tests/tcg/multiarch/system/Makefile.softmmu-target
@@ -6,6 +6,11 @@
# architecture to add to the test dependencies and deal with the
# complications of building.
#
+# To support the multiarch guests the target arch needs to provide a
+# boot.S that jumps to main and provides a __sys_outc functions.
+# Remember to update MULTIARCH_SOFTMMU_TARGETS in the tcg test
+# Makefile.target when this is done.
+#
MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch
MULTIARCH_SYSTEM_SRC=$(MULTIARCH_SRC)/system
--
2.47.2
next prev parent reply other threads:[~2025-07-25 15:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-25 15:45 [PATCH for 10.1 v2 00/14] documentation updates and test tweaks pre-PR Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 01/14] docs/user: clarify user-mode expects the same OS Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 02/14] docs/system: reword the TAP notes to remove tarball ref Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 03/14] docs/user: clean up headings Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 04/14] docs/user: slightly reword section on system calls Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 05/14] docs/user: expand section on threading Alex Bennée
2025-07-25 19:57 ` Richard Henderson
2025-07-25 15:45 ` [PATCH for 10.1 v2 06/14] tests/functional: add hypervisor test for aarch64 Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 07/14] tests/tcg: skip libsyscall.so on softmmu tests Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 08/14] tests/tcg: remove ADDITIONAL_PLUGINS_TESTS Alex Bennée
2025-07-25 15:45 ` Alex Bennée [this message]
2025-07-25 15:45 ` [PATCH for 10.1 v2 10/14] configure: expose PYTHON to test/tcg/config-host.mak Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 11/14] tests/tcg: reduce the number of plugin tests combinations Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 12/14] tests/docker: add --arch-only to qemu deps for all-test-cross Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 13/14] tests/docker: handle host-arch selection " Alex Bennée
2025-07-25 15:45 ` [PATCH for 10.1 v2 14/14] tests/functional: expose sys.argv to unittest.main Alex Bennée
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=20250725154517.3523095-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=manos.pitsidianakis@linaro.org \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).