From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8SEq-0005zj-ML for qemu-devel@nongnu.org; Tue, 17 Apr 2018 11:09:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f8SEn-0001N6-Gh for qemu-devel@nongnu.org; Tue, 17 Apr 2018 11:09:44 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:45158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f8SEn-0001Lx-5r for qemu-devel@nongnu.org; Tue, 17 Apr 2018 11:09:41 -0400 Received: by mail-wr0-x234.google.com with SMTP id u11so36506640wri.12 for ; Tue, 17 Apr 2018 08:09:41 -0700 (PDT) References: <20180410193919.28026-1-alex.bennee@linaro.org> <20180410193919.28026-24-alex.bennee@linaro.org> <8838744d-6952-38ea-6cee-a151e30fdbca@amsat.org> <87efjfbkh6.fsf@linaro.org> <1cfe9453-44f6-0dcd-4297-9715160b8620@amsat.org> <8736zuc3to.fsf@linaro.org> <772e1881-ec44-baf3-8113-4bf90915c455@amsat.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <772e1881-ec44-baf3-8113-4bf90915c455@amsat.org> Date: Tue, 17 Apr 2018 16:09:38 +0100 Message-ID: <87zi21amz1.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v1 23/24] Makefile.target: add (clean-)guest-tests targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, famz@redhat.com, cota@braap.org Philippe Mathieu-Daud=C3=A9 writes: > Hi Alex > > On 04/16/2018 05:08 PM, Alex Benn=C3=A9e wrote: >>>>>> 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=C3=A9e >>>>>> --- >>>>>> 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=3D$(QEMU_PROG) $(QEMU_PROGW) >>>>>> STPFILES=3D >>>>>> >>>>>> +# 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 configur= ed >>>>>> +# guest compiler or calling one of our docker images to do it for u= s. >>>>>> +# >>>>>> + >>>>>> +# 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=3D$(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.inclu= de >>>>>> +CHECK_INCLUDE=3D$(wildcard $(ARCH_MAKEFILE)) >>>>>> + >>>>>> +ifeq ($(ARCH_MAKEFILE),$(CHECK_INCLUDE)) >>>>>> +include $(ARCH_MAKEFILE) >>>>>> +endif >>>>>> + >>>>>> +GUEST_BUILD=3D >>>>>> + >>>>>> +# 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=3D$(TARGET_NAME) CC= =3D$(CROSS_CC_GUEST)), \ >>>>>> + "CROSS-BUILD","$(TARGET_NAME) guest-tests with $(CROSS_CC_GUEST)= ") >>>>>> + >>>>>> + >>>>>> +GUEST_BUILD=3Dcross-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 >>>>>> + >>>>> >>>>> Eventually: >>>>> >>>>> DOCKER_CROSS_COMPILER ?=3D $(DOCKER_CROSS_COMPILER_PREFIX)-gcc >>>>> >>>>>> +DOCKER_COMPILE_CMD=3D"$(DOCKER_SCRIPT) cc --user $(shell id -u) \ >>>>>> + --cc $(DOCKER_CROSS_COMPILER) \ >>>>>> + -i qemu:$(DOCKER_IMAGE) \ >>>>>> + -s $(SRC_PATH) -- " >>>>> >>>>> Should we check $(DOCKER_CROSS_COMPILER) is set? >>>> >>>> Currently it's implied. It would be nice if there was an easy way just >>>> to fish it out of the env of the docker image as they already have it >>>> set there. >>>> >>>> I've been trying quite hard to ensure all the tests can just use LD (s= ee >>>> the hoops I jump in i386 for this). Maybe a prefix config makes more >>>> sense though.... >>> >>> We might also need some CROSS_CFLAGS, i.e. for armeb we need to use >>> -mbig-endian. This would go in >>> tests/tcg/$(TARGET_NAME)/Makefile.target >> >> Yeah we can fish that out from config-target.mak >> >> However I've run into problems with compiling things with -mbig-endian >> as it forces the inclusion of something that seems to be missing in the >> glibc-dev: >> >> >> aarch64-linux-gnu-gcc -mbig-endian -o config-temp/qemu-conf.exe config-t= emp/qemu-conf.c -static >> In file included from /usr/aarch64-linux-gnu/include/features.h:391:0, >> from /usr/aarch64-linux-gnu/include/stdio.h:27, >> from config-temp/qemu-conf.c:1: >> /usr/aarch64-linux-gnu/include/gnu/stubs.h:11:32: fatal error: gnu/stubs= -lp64_be.h: No such file or directory >> compilation terminated. >> >> And they aren't packaged if the distro doesn't support the arch. > > Oh I never tried BE on v8, but I'm successfully using it for v7, having > the following packages installed: > > - gcc-arm-none-eabi > - gdb-arm-none-eabi > - libnewlib-arm-none-eabi > - binutils-arm-none-eabi > > Indeed I'm not using the glibc but newlib, BE libs are here: > > /usr/lib/arm-none-eabi/newlib/thumb/armv7-ar/fpu/vfpv3-d16/be So maybe we need a docker-arm3264be-cross with newlib? > >>>>>> +DOCKER_PREREQ=3Ddocker-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=3D$(TARGET_NAME) CC= =3D$(DOCKER_COMPILE_CMD)), \ >>>>>> + "CROSS-BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOC= KER_IMAGE)") >>>>>> + >>>>>> +GUEST_BUILD=3Ddocker-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) gu= est-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" >>>>>> >> >> >> -- >> Alex Benn=C3=A9e >> -- Alex Benn=C3=A9e