[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/26] tests/tcg: add softmmu awareness to Makefile
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 06/26] tests/tcg: add softmmu awareness to Makefile |
Date: |
Tue, 12 Mar 2019 17:09:11 +0000 |
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile
index bf06415390..55feab0f67 100644
--- a/tests/tcg/Makefile
+++ b/tests/tcg/Makefile
@@ -26,7 +26,7 @@
#
# We also accept SPEED=slow to enable slower running tests
#
-# We also expect to be in the tests build dir for the FOO-linux-user.
+# We also expect to be in the tests build dir for the FOO-(linux-user|softmmu).
#
-include ../../config-host.mak
@@ -52,7 +52,11 @@ QEMU_CFLAGS=
LDFLAGS=
# The QEMU for this TARGET
+ifdef CONFIG_USER_ONLY
QEMU=../qemu-$(TARGET_NAME)
+else
+QEMU=../qemu-system-$(TARGET_NAME)
+endif
# If TCG debugging is enabled things are a lot slower
ifeq ($(CONFIG_DEBUG_TCG),y)
@@ -61,6 +65,7 @@ else
TIMEOUT=15
endif
+ifdef CONFIG_USER_ONLY
# The order we include is important. We include multiarch, base arch
# and finally arch if it's not the same as base arch.
-include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target
@@ -77,6 +82,16 @@ endif
%: %.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
+else
+# For softmmu targets we include a different Makefile fragement as the
+# build options for bare programs are usually pretty different. They
+# are expected to provide their own build recipes.
+-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target
+ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME))
+-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target
+endif
+
+endif
all: $(TESTS)
diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include
index c581bd6ffc..73b5626fc5 100644
--- a/tests/tcg/Makefile.include
+++ b/tests/tcg/Makefile.include
@@ -67,7 +67,7 @@ endif
ifneq ($(GUEST_BUILD),)
guest-tests: $(GUEST_BUILD)
-run-guest-tests: guest-tests qemu-$(TARGET_NAME)
+run-guest-tests: guest-tests qemu-$(subst
y,system-,$(CONFIG_SOFTMMU))$(TARGET_NAME)
$(call quiet-command, \
(cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=$(SPEED) run), \
"RUN", "tests for $(TARGET_NAME)")
--
2.20.1
- [Qemu-devel] [PULL 24/26] tests/tcg/arm: account for pauth randomness, (continued)
- [Qemu-devel] [PULL 24/26] tests/tcg/arm: account for pauth randomness, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 17/26] tests/tcg: split cris tests into bare and libc directories, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 20/26] tests/tcg: enable cris base user-mode tests, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 21/26] tests/tcg: provide a minilib for system tests, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 22/26] tests/tcg/i386: add system mode Hello World test, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 12/26] tests/docker: add debian-xtensa-cross image, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 26/26] .travis.yml: add softmmu check-tcg tests, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 19/26] tests/tcg/cris: align mul operations, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 25/26] .travis.yml: separate softfloat from check-tcg, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 13/26] tests/tcg/xtensa: enable system tests, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 06/26] tests/tcg: add softmmu awareness to Makefile,
Alex Bennée <=
- [Qemu-devel] [PULL 03/26] .travis.yml: reduce the module builds to major architectures, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 01/26] travis: Bump Xcode 10 image to 10.2, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 02/26] .travis.yml: combine docs and tools build with out-of-tree, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 09/26] tests/tcg: split run-test into user and system variants, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 16/26] tests/tcg/cris: cleanup sys.c, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 15/26] tests/docker: add fedora-cris-cross compilers, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 11/26] tests/tcg/mips: fix hello-mips compilation, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 14/26] tests/tcg/arm: add ARMv6-M UNDEFINED 32-bit instruction test, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 10/26] tests/tcg: add gdb runner variant, Alex Bennée, 2019/03/12
- [Qemu-devel] [PULL 07/26] tests/tcg: enable tcg tests for softmmu, Alex Bennée, 2019/03/12