diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2025-07-25 16:45:12 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2025-07-26 23:04:35 +0100 |
| commit | ab8bf8f6e42e321dfb313cfdf95200135e9f7f8e (patch) | |
| tree | 47c03ebee7b10e115797fe3e21f77c311e307fc4 | |
| parent | a80e2c26f1cbac07d923415fecbf274ce4fa2d02 (diff) | |
| download | focaccia-qemu-ab8bf8f6e42e321dfb313cfdf95200135e9f7f8e.tar.gz focaccia-qemu-ab8bf8f6e42e321dfb313cfdf95200135e9f7f8e.zip | |
tests/tcg: don't include multiarch tests if not supported
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> Message-ID: <20250725154517.3523095-10-alex.bennee@linaro.org>
| -rw-r--r-- | tests/tcg/Makefile.target | 6 | ||||
| -rw-r--r-- | tests/tcg/multiarch/system/Makefile.softmmu-target | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 97ebe8f9bc..a12b15637e 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 07be001102..5acf270081 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 |