[PULL,15/56] tests/tcg: enable building for i386

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

Message ID

20180619154435.18898-16-alex.bennee@linaro.org

State

New

Headers

From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Tue, 19 Jun 2018 16:43:54 +0100
Message-Id: <20180619154435.18898-16-alex.bennee@linaro.org>
In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org>
References: <20180619154435.18898-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 15/56] tests/tcg: enable building for i386
Precedence: list
Cc: agraf@suse.de, Eduardo Habkost <ehabkost@redhat.com>, =?utf-8?q?Alex_B?=
	=?utf-8?b?ZW5uw6ll?= <alex.bennee@linaro.org>,
	richard.henderson@linaro.org, qemu-devel@nongnu.org, 
	f4bug@amsat.org, cota@braap.org, Paolo Bonzini <pbonzini@redhat.com>,
	famz@redhat.com, aurelien@aurel32.net,
	Richard Henderson <rth@twiddle.net>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

[PULL,01/56] configure: add support for --cross-cc-FOO | expand

Commit Message

Alex Bennée June 19, 2018, 3:43 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

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

[PULL,15/56] tests/tcg: enable building for i386

Commit Message

Patch