From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org, cota@braap.org, famz@redhat.com,
berrange@redhat.com, f4bug@amsat.org,
richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v2 36/43] Makefile.target: add (clean-)guest-tests targets
Date: Thu, 19 Apr 2018 14:58:54 +0100 [thread overview]
Message-ID: <20180419135901.30035-37-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180419135901.30035-1-alex.bennee@linaro.org>
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 <alex.bennee@linaro.org>
---
Makefile.target | 5 +++
tests/tcg/Makefile.include | 79 ++++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+)
create mode 100644 tests/tcg/Makefile.include
diff --git a/Makefile.target b/Makefile.target
index d0ec77a307..a30fd40257 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..cb8bb36026
--- /dev/null
+++ b/tests/tcg/Makefile.include
@@ -0,0 +1,79 @@
+# -*- 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 it if it
+# exists
+
+ARCH_MAKEFILE=$(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include
+CHECK_INCLUDE=$(wildcard $(ARCH_MAKEFILE))
+
+ifeq ($(ARCH_MAKEFILE),$(CHECK_INCLUDE))
+include $(ARCH_MAKEFILE)
+endif
+
+GUEST_BUILD=
+
+# 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 $(SRC_PATH)/tests/tcg/Makefile ARCH=$(TARGET_NAME) CC=$(CROSS_CC_GUEST)), \
+ "CROSS-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 $(SRC_PATH)/tests/tcg/Makefile ARCH=$(TARGET_NAME) CC=$(DOCKER_COMPILE_CMD)), \
+ "CROSS-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)
+else
+guest-tests:
+ $(call quiet-command, /bin/true, "CROSS-BUILD", "$(TARGET_NAME) guest-tests SKIPPED")
+endif
+
+# It doesn't mater if these don't exits
+.PHONY: clean-guest-tests
+clean-guest-tests:
+ rm -rf tests || echo "no $(TARGET_NAME) tests to remove"
--
2.17.0
next prev parent reply other threads:[~2018-04-19 14:17 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 13:58 [Qemu-devel] [PATCH v2 00/43] fix building of tests/tcg Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 01/43] docker: add "probe" command for configure Alex Bennée
2018-04-20 2:08 ` Fam Zheng
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 02/43] configure: add test for docker availability Alex Bennée
2018-04-19 20:49 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 03/43] configure: add support for --cross-cc-FOO Alex Bennée
2018-04-19 20:20 ` Richard Henderson
2018-04-19 20:41 ` Richard Henderson
2018-04-19 20:47 ` Richard Henderson
2018-04-19 21:36 ` Eric Blake
2018-04-19 21:41 ` Eric Blake
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 04/43] configure: move i386_cc to cross_cc_i386 Alex Bennée
2018-04-19 20:59 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 05/43] configure: allow user to specify --cross-cc-cflags-foo= Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 06/43] configure: set cross_cc_FOO for host compiler Alex Bennée
2018-04-19 21:04 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 07/43] Makefile: Rename TARGET_DIRS to TARGET_LIST Alex Bennée
2018-04-19 21:05 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 08/43] docker: Add "cc" subcommand Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 09/43] docker: extend "cc" command to accept compiler Alex Bennée
2018-04-20 2:06 ` Fam Zheng
2018-04-20 2:43 ` Philippe Mathieu-Daudé
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 10/43] docker: allow "cc" command to run in user context Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 11/43] docker: Makefile.include introduce DOCKER_SCRIPT Alex Bennée
2018-04-19 21:08 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 12/43] tests/tcg: move architecture independent tests into subdir Alex Bennée
2018-04-19 21:20 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 13/43] tests/tcg/multiarch: Build fix for linux-test Alex Bennée
2018-04-19 21:20 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 14/43] tests/tcg/multiarch: enable additional linux-test tests Alex Bennée
2018-04-19 21:22 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 15/43] tests/tcg: move i386 specific tests into subdir Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 16/43] docker: Add fedora-i386-cross image Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 17/43] tests/tcg: enable building for i386 Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 18/43] tests/tcg/i386: Build fix for hello-i386 Alex Bennée
2018-04-19 21:25 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 19/43] tests/tcg/i386: fix test-i386 Alex Bennée
2018-04-19 21:26 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 20/43] tests/tcg/i386: fix test-i386-fprem Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 21/43] tests/tcg/i386: disable i386 version of test-i386-ssse Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 22/43] tests/tcg/x86_64: add Makefile.target Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 23/43] tests/tcg/i386/test-i386: use modern vector_size attributes Alex Bennée
2018-04-19 21:27 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 24/43] tests/tcg/i386/test-i386: fix printf format Alex Bennée
2018-04-19 21:28 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 25/43] tests/tcg: move ARM specific tests into subdir Alex Bennée
2018-04-19 21:29 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 26/43] tests/tcg/arm: fix up test-arm-iwmmxt test Alex Bennée
2018-04-19 21:32 ` Richard Henderson
2018-04-20 8:18 ` Alex Bennée
2018-04-20 21:16 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 27/43] tests/tcg/aarch64: add Makefile.target Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 28/43] tests/tcg/aarch64: add fcvt test cases for AArch64 Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 29/43] tests/tcg/aarch64: userspace system register test Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 30/43] tests/tcg: move MIPS specific tests into subdir Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 31/43] tests/tcg: enable building for MIPS Alex Bennée
2018-04-19 17:05 ` Philippe Mathieu-Daudé
2018-04-19 17:49 ` Alex Bennée
2018-04-19 17:58 ` Peter Maydell
2018-04-20 2:57 ` Philippe Mathieu-Daudé
2018-04-20 3:08 ` Fam Zheng
2018-04-20 8:29 ` Alex Bennée
2018-04-20 9:29 ` Alex Bennée
2018-04-20 11:00 ` Peter Maydell
2018-04-20 11:57 ` Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 32/43] tests/tcg/mips: include common mips hello-mips Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 33/43] tests/tcg: enable building for s390x Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 34/43] tests/tcg: enable building for ppc64 Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 35/43] tests/tcg/Makefile: update to be called from Makefile.target Alex Bennée
2018-04-19 13:58 ` Alex Bennée [this message]
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 37/43] tests/Makefile.include: add (clean-)check-tcg targets Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 38/43] osdep: disable glib-compat.h include with QEMU_NO_GLIB Alex Bennée
2018-04-19 21:41 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 39/43] softfloat: do not include glib headers Alex Bennée
2018-04-19 21:41 ` Richard Henderson
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 40/43] tests: add fp-test, a floating point test suite Alex Bennée
2018-04-19 13:58 ` [Qemu-devel] [PATCH v2 41/43] tests/tcg/multiarch: add fp-test into multiarch set Alex Bennée
2018-04-19 13:59 ` [Qemu-devel] [PATCH v2 42/43] tests/tcg: disable fp-test for 32 bit (HACK!) Alex Bennée
2018-04-19 22:02 ` Richard Henderson
2018-04-20 6:43 ` Alex Bennée
2018-04-19 13:59 ` [Qemu-devel] [PATCH v2 43/43] tests: fp-test add fcvt support (!INCOMPLETE WIP) Alex Bennée
2018-04-19 14:52 ` [Qemu-devel] [PATCH v2 00/43] fix building of tests/tcg no-reply
2018-04-19 15:02 ` no-reply
2018-04-20 0:12 ` Richard Henderson
2018-04-20 2:32 ` Philippe Mathieu-Daudé
2018-04-20 6:42 ` Alex Bennée
2018-04-20 19:05 ` Emilio G. Cota
2018-04-20 22:02 ` Richard Henderson
2018-04-20 2:10 ` Fam Zheng
2018-04-20 3:41 ` Max Filippov
2018-04-22 20:22 ` Richard Henderson
2018-04-23 12:53 ` Alex Bennée
2018-04-23 14:26 ` 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=20180419135901.30035-37-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).