[v6,14/49] tests/tcg: enable building for i386

Message ID	20180608123307.24773-15-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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:32 +0100 Message-Id: <20180608123307.24773-15-alex.bennee@linaro.org> In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v6 14/49] tests/tcg: enable building for i386 Precedence: list Cc: =?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 \| expand [v6,00/49] fix building of tests/tcg [v6,01/49] configure: add support for --cross-cc-FOO [v6,02/49] configure: move i386_cc to cross_cc_i386 [v6,03/49] configure: allow user to specify --cross-cc-cflags-foo= [v6,04/49] configure: set cross_cc_FOO for host compiler [v6,05/49] docker: Add "cc" subcommand [v6,06/49] docker: extend "cc" command to accept compiler [v6,07/49] docker: allow "cc" command to run in user context [v6,08/49] docker: Makefile.include introduce DOCKER_SCRIPT [v6,09/49] tests/tcg: move architecture independent tests into subdir [v6,10/49] tests/tcg/multiarch: Build fix for linux-test [v6,11/49] tests/tcg/multiarch: enable additional linux-test tests [v6,12/49] tests/tcg/multiarch: move most output to stdout [v6,13/49] tests/tcg: move i386 specific tests into subdir [v6,14/49] tests/tcg: enable building for i386 [v6,15/49] tests/tcg/i386: Build fix for hello-i386 [v6,16/49] tests/tcg/i386: fix test-i386 [v6,17/49] tests/tcg/i386: add runner for test-i386-fprem [v6,18/49] tests/tcg/x86_64: add Makefile.target [v6,19/49] tests/tcg/i386/test-i386: use modern vector_size attributes [v6,20/49] tests/tcg/i386/test-i386: fix printf format [v6,21/49] tests/tcg: move ARM specific tests into subdir [v6,22/49] tests/tcg: enable building for ARM [v6,23/49] tests/tcg/arm: fix up test-arm-iwmmxt test [v6,24/49] tests/tcg: enable building for AArch64 [v6,25/49] tests/tcg/arm: add fcvt test cases for AArch32/64 [v6,26/49] tests/tcg: move MIPS specific tests into subdir [v6,27/49] tests/tcg: enable building for MIPS [v6,28/49] tests/tcg/mips: include common mips hello-mips [v6,29/49] tests/tcg: enable building for s390x [v6,30/49] tests/tcg: enable building for ppc64 [v6,31/49] tests/tcg: enable building for Alpha [v6,32/49] tests/tcg/alpha: add Alpha specific tests [v6,33/49] tests/tcg: enable building for HPPA [v6,34/49] tests/tcg: enable building for m68k [v6,35/49] tests/tcg: enable building for sh4 [v6,36/49] tests/tcg: enable building for sparc64 [v6,37/49] tests/tcg: enable building for mips64 [v6,38/49] tests/tcg: enable building for RISCV64 [v6,39/49] docker: move debian-powerpc-cross to sid based build [v6,40/49] tests/tcg: enable building for PowerPC [v6,41/49] tests/tcg/Makefile: update to be called from Makefile.target [v6,42/49] Makefile.target: add (clean-/build-)guest-tests targets [v6,43/49] tests/Makefile.include: add [build\|clean\|check]-tcg targets [v6,44/49] tests/tcg: add run, diff, and skip helper macros [v6,45/49] tests/tcg: override runners for broken tests [v6,46/49] target/sh4: Fix translator.c assertion failure for gUSA [v6,47/49] tests: add top-level make dependency for docker builds [v6,48/49] tests/docker: prevent sub-makes re-building debian-sid [v6,49/49] .travis.yml: add check-tcg test

Message ID

20180608123307.24773-15-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, pbonzini@redhat.com, stefanha@redhat.com,
	stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com
Date: Fri,  8 Jun 2018 13:32:32 +0100
Message-Id: <20180608123307.24773-15-alex.bennee@linaro.org>
In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org>
References: <20180608123307.24773-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v6 14/49] tests/tcg: enable building for i386
Precedence: list
Cc: =?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 | expand

Commit Message

Alex Bennée June 8, 2018, 12:32 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

[v6,14/49] tests/tcg: enable building for i386

Commit Message

Patch