[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 45/57] Makefile.target: add (clean-/build-)guest-t
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 45/57] Makefile.target: add (clean-/build-)guest-tests targets |
Date: |
Thu, 21 Jun 2018 07:25:53 +0100 |
Now all the build infrastructure is in place we can build tests for
each guest that we support. That support mainly depends on having
cross compilers installed or docker setup. To keep all the logic for
that together we put the rules in tests/tcg/Makefile.include and
include it from the main Makefile.target.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/MAINTAINERS b/MAINTAINERS
index 4c955425b9..6c747ff69e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2160,6 +2160,7 @@ Guest Test Compilation Support
M: Alex Bennée <address@hidden>
R: Philippe Mathieu-Daudé <address@hidden>
F: tests/tcg/Makefile
+F: tests/tcg/Makefile.include
L: address@hidden
Documentation
diff --git a/Makefile.target b/Makefile.target
index dad2cf8778..a9d8928f96 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -36,6 +36,11 @@ endif
PROGS=$(QEMU_PROG) $(QEMU_PROGW)
STPFILES=
+# Makefile Tests
+ifdef CONFIG_USER_ONLY
+include $(SRC_PATH)/tests/tcg/Makefile.include
+endif
+
config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak
diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include
new file mode 100644
index 0000000000..57470b2a2c
--- /dev/null
+++ b/tests/tcg/Makefile.include
@@ -0,0 +1,88 @@
+# -*- Mode: makefile -*-
+#
+# TCG tests (per-target rules)
+#
+# This Makefile fragement is included from the per-target
+# Makefile.target so will be invoked for each linux-user program we
+# build. We have two options for compiling, either using a configured
+# guest compiler or calling one of our docker images to do it for us.
+#
+
+# The per ARCH makefile, if it exists, holds extra information about
+# useful docker images or alternative compiler flags.
+
+-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include
+-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include
+
+GUEST_BUILD=
+TCG_MAKE=$(SRC_PATH)/tests/tcg/Makefile
+# Support installed Cross Compilers
+
+ifdef CROSS_CC_GUEST
+
+.PHONY: cross-build-guest-tests
+cross-build-guest-tests:
+ $(call quiet-command, \
+ (mkdir -p tests && cd tests && \
+ $(MAKE) -f $(TCG_MAKE) CC=$(CROSS_CC_GUEST) \
+ BUILD_STATIC=$(CROSS_CC_GUEST_STATIC) \
+ EXTRA_CFLAGS=$(CROSS_CC_GUEST_CFLAGS)), \
+ "BUILD","$(TARGET_NAME) guest-tests with $(CROSS_CC_GUEST)")
+
+GUEST_BUILD=cross-build-guest-tests
+
+endif
+
+# Support building with Docker
+
+ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y)
+ifneq ($(DOCKER_IMAGE),)
+
+# We also need the Docker make rules to depend on
+include $(SRC_PATH)/tests/docker/Makefile.include
+
+DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \
+ --cc $(DOCKER_CROSS_COMPILER) \
+ -i qemu:$(DOCKER_IMAGE) \
+ -s $(SRC_PATH) -- "
+DOCKER_PREREQ=docker-image-$(DOCKER_IMAGE)
+
+.PHONY: docker-build-guest-tests
+docker-build-guest-tests: $(DOCKER_PREREQ)
+ $(call quiet-command, \
+ (mkdir -p tests && cd tests && \
+ $(MAKE) -f $(TCG_MAKE) CC=$(DOCKER_COMPILE_CMD) \
+ BUILD_STATIC=y \
+ EXTRA_CFLAGS=$(DOCKER_CROSS_COMPILER_CFLAGS)), \
+ "BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOCKER_IMAGE)")
+
+GUEST_BUILD=docker-build-guest-tests
+
+endif
+endif
+
+# Final targets
+.PHONY: guest-tests
+
+ifneq ($(GUEST_BUILD),)
+guest-tests: $(GUEST_BUILD)
+
+run-guest-tests: guest-tests qemu-$(TARGET_NAME)
+ $(call quiet-command, \
+ (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=$(SPEED) run), \
+ "RUN", "tests for $(TARGET_NAME)")
+
+else
+guest-tests:
+ $(call quiet-command, /bin/true, "BUILD", \
+ "$(TARGET_NAME) guest-tests SKIPPED")
+
+run-guest-tests:
+ $(call quiet-command, /bin/true, "RUN", \
+ "tests for $(TARGET_NAME) SKIPPED")
+endif
+
+# It doesn't matter if these don't exits
+.PHONY: clean-guest-tests
+clean-guest-tests:
+ rm -rf tests || echo "no $(TARGET_NAME) tests to remove"
--
2.17.1
- [Qemu-devel] [PULL v2 17/57] tests/tcg/i386: Build fix for hello-i386, (continued)
- [Qemu-devel] [PULL v2 17/57] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe usage, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 25/57] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 39/57] tests/tcg: enable building for sparc64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 49/57] tests/tcg/i386: extend timeout for runcom test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 56/57] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 44/57] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 47/57] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 15/57] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 33/57] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 45/57] Makefile.target: add (clean-/build-)guest-tests targets,
Alex Bennée <=
- [Qemu-devel] [PULL v2 19/57] tests/tcg/i386: add runner for test-i386-fprem, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 46/57] tests/Makefile.include: add [build|clean|check]-tcg targets, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 27/57] tests/tcg/arm: add fcvt test cases for AArch32/64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 22/57] tests/tcg/i386/test-i386: fix printf format, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 40/57] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 11/57] tests/tcg/multiarch: Build fix for linux-test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 30/57] tests/docker/Makefile.include: fix mipsel-cross dependancy, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 34/57] tests/tcg: enable building for Alpha, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 35/57] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 23/57] tests/tcg: move ARM specific tests into subdir, Alex Bennée, 2018/06/21