[v7,15/54] tests/tcg: enable building for i386

Message ID	20180615194705.28019-16-alex.bennee@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: 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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:26 +0100 Message-Id: <20180615194705.28019-16-alex.bennee@linaro.org> In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v7 15/54] tests/tcg: enable building for i386 Precedence: list Cc: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>, Richard Henderson <rth@twiddle.net> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	fix building of tests/tcg - last chance to review! \| expand [v7,00/54] fix building of tests/tcg - last chance to review! [v7,01/54] configure: add support for --cross-cc-FOO [v7,02/54] configure: move i386_cc to cross_cc_i386 [v7,03/54] configure: allow user to specify --cross-cc-cflags-foo= [v7,04/54] configure: set cross_cc_FOO for host compiler [v7,05/54] docker: Add "cc" subcommand [v7,06/54] docker: extend "cc" command to accept compiler [v7,07/54] docker: allow "cc" command to run in user context [v7,08/54] docker: Makefile.include introduce DOCKER_SCRIPT [v7,09/54] tests/tcg: move architecture independent tests into subdir [v7,10/54] tests/tcg/multiarch: Build fix for linux-test [v7,11/54] tests/tcg/multiarch: enable additional linux-test tests [v7,12/54] tests/tcg/multiarch: don't hard code paths/ports for linux-test [v7,13/54] tests/tcg/multiarch: move most output to stdout [v7,14/54] tests/tcg: move i386 specific tests into subdir [v7,15/54] tests/tcg: enable building for i386 [v7,16/54] tests/tcg/i386: Build fix for hello-i386 [v7,17/54] tests/tcg/i386: fix test-i386 [v7,18/54] tests/tcg/i386: add runner for test-i386-fprem [v7,19/54] tests/tcg/x86_64: add Makefile.target [v7,20/54] tests/tcg/i386/test-i386: use modern vector_size attributes [v7,21/54] tests/tcg/i386/test-i386: fix printf format [v7,22/54] tests/tcg: move ARM specific tests into subdir [v7,23/54] tests/tcg: enable building for ARM [v7,24/54] tests/tcg/arm: fix up test-arm-iwmmxt test [v7,25/54] tests/tcg: enable building for AArch64 [v7,26/54] tests/tcg/arm: add fcvt test cases for AArch32/64 [v7,27/54] tests/tcg: move MIPS specific tests into subdir [v7,28/54] tests/tcg: enable building for MIPS [v7,29/54] tests/docker/Makefile.include: fix mipsel-cross dependancy [v7,30/54] tests/tcg/mips: include common mips hello-mips [v7,31/54] tests/tcg: enable building for s390x [v7,32/54] tests/tcg: enable building for ppc64 [v7,33/54] tests/tcg: enable building for Alpha [v7,34/54] tests/tcg/alpha: add Alpha specific tests [v7,35/54] tests/tcg: enable building for HPPA [v7,36/54] tests/tcg: enable building for m68k [v7,37/54] tests/tcg: enable building for sh4 [v7,38/54] tests/tcg: enable building for sparc64 [v7,39/54] tests/tcg: enable building for mips64 [v7,40/54] tests/tcg: enable building for RISCV64 [v7,41/54] docker: move debian-powerpc-cross to sid based build [v7,42/54] tests/tcg: enable building for PowerPC [v7,43/54] tests/tcg/Makefile: update to be called from Makefile.target [v7,44/54] Makefile.target: add (clean-/build-)guest-tests targets [v7,45/54] tests/Makefile.include: add [build\|clean\|check]-tcg targets [v7,46/54] tests/tcg: add run, diff, and skip helper macros [v7,47/54] tests/tcg: override runners for broken tests [v7,48/54] tests: add top-level make dependency for docker builds [v7,49/54] docker: docker.py don't conflate checksums for extra_files [v7,50/54] docker: docker.py add check sub-command [v7,51/54] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1 [v7,52/54] docker: docker.py adding age check command [v7,53/54] tests/docker/Makefile.include: only force SID to NOCACHE if old [v7,54/54] .travis.yml: add check-tcg test

Message ID

20180615194705.28019-16-alex.bennee@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: 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, peter.maydell@linaro.org
Date: Fri, 15 Jun 2018 20:46:26 +0100
Message-Id: <20180615194705.28019-16-alex.bennee@linaro.org>
In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org>
References: <20180615194705.28019-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v7 15/54] tests/tcg: enable building for i386
Precedence: list
Cc: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, qemu-devel@nongnu.org,
	Eduardo Habkost <ehabkost@redhat.com>, Richard Henderson
	<rth@twiddle.net>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

fix building of tests/tcg - last chance to review! | expand

Commit Message

Alex Bennée June 15, 2018, 7:46 p.m. UTC

While you can construct a compile command that does work using the
x86_64 host compiler that most people use this is flakey. Different
distros handle this is different ways so we default to using a known
good i386 compiler via docker.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


---
v3
  - add runner for runcom
v4
  - runcom pi10.com directly from SRC_DIR
v5
  - define extra test-mmap runs
---
 tests/tcg/i386/Makefile.include | 9 +++++++++
 tests/tcg/i386/Makefile.target  | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/tcg/i386/Makefile.include

-- 
2.17.1

diff --git a/tests/tcg/i386/Makefile.include b/tests/tcg/i386/Makefile.include
new file mode 100644
index 0000000000..be1c3008dd
--- /dev/null
+++ b/tests/tcg/i386/Makefile.include
@@ -0,0 +1,9 @@ 
+#
+# Makefile.include for all i386
+#
+# There is enough brokeness in x86_64 compilers that we don't default
+# to using the x86_64 system compiler for i386 binaries.
+#
+
+DOCKER_IMAGE=fedora-i386-cross
+DOCKER_CROSS_COMPILER=gcc
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index 2f27b65e2d..8b46cc021e 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -28,3 +28,10 @@  hello-i386: LDFLAGS+=-nostdlib
 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
 	   $(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm
+
+# Specialist test runners
+run-runcom: runcom pi_10.com
+	$(call quiet-command, $(QEMU) ./runcom $(I386_SRC)/pi_10.com > runcom.out, "TEST", "$< on $(TARGET_NAME)")
+
+# On i386 and x86_64 Linux only supports 4k pages (large pages are a different hack)
+EXTRA_RUNS+=run-test-mmap-4096

[v7,15/54] tests/tcg: enable building for i386

Commit Message

Patch