qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 09/12] tests/docker: use a gcc-10 based image for arm64 tests
Date: Wed, 27 May 2020 15:54:52 +0100	[thread overview]
Message-ID: <20200527145455.2550-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200527145455.2550-1-alex.bennee@linaro.org>

As we enable newer features that we want to test on arm64 targets we
need newer compilers. Split off a new debian-arm64-test-cross image
which we can use to build these new tests.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200520140541.30256-11-alex.bennee@linaro.org>

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 3596b589307..ed46bd98eb5 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -131,9 +131,11 @@ docker-image-travis: NOUSER=1
 
 # Specialist build images, sometimes very limited tools
 docker-image-tricore-cross: docker-image-debian9
+docker-image-debian-arm64-test-cross: docker-image-debian11
 
 # These images may be good enough for building tests but not for test builds
 DOCKER_PARTIAL_IMAGES += debian-alpha-cross
+DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross
 DOCKER_PARTIAL_IMAGES += debian-hppa-cross
 DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
 DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross
diff --git a/tests/docker/dockerfiles/debian-arm64-test-cross.docker b/tests/docker/dockerfiles/debian-arm64-test-cross.docker
new file mode 100644
index 00000000000..a44e76d9421
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-arm64-test-cross.docker
@@ -0,0 +1,13 @@
+#
+# Docker arm64 cross-compiler target (tests only)
+#
+# This docker target builds on the debian Bullseye base image.
+#
+FROM qemu:debian11
+
+# Add the foreign architecture we want and install dependencies
+RUN dpkg --add-architecture arm64
+RUN apt update && \
+    DEBIAN_FRONTEND=noninteractive eatmydata \
+        apt install -y --no-install-recommends \
+        crossbuild-essential-arm64 gcc-10-aarch64-linux-gnu
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index eaaaff6233a..2326f978562 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -97,8 +97,8 @@ for target in $target_list; do
   case $target in
     aarch64-*)
       # We don't have any bigendian build tools so we only use this for AArch64
-      container_image=debian-arm64-cross
-      container_cross_cc=aarch64-linux-gnu-gcc
+      container_image=debian-arm64-test-cross
+      container_cross_cc=aarch64-linux-gnu-gcc-10
       ;;
     alpha-*)
       container_image=debian-alpha-cross
-- 
2.20.1



  parent reply	other threads:[~2020-05-27 14:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27 14:54 [PULL 00/12] testing and plugin fixes Alex Bennée
2020-05-27 14:54 ` [PULL 01/12] configure: add alternate binary for genisoimage Alex Bennée
2020-05-27 14:54 ` [PULL 02/12] tests/vm: pass --genisoimage to basevm script Alex Bennée
2020-05-27 14:54 ` [PULL 03/12] travis.yml: Use clang++ in the Clang tests Alex Bennée
2020-05-27 14:54 ` [PULL 04/12] tests/tcg: fix invocation of the memory record/replay tests Alex Bennée
2020-05-27 14:54 ` [PULL 05/12] tests/fp: enable extf80_le_quite tests Alex Bennée
2020-05-27 14:54 ` [PULL 06/12] tests/fp: split and audit the conversion tests Alex Bennée
2020-05-27 14:54 ` [PULL 07/12] tests/tcg: better detect confused gdb which can't connect Alex Bennée
2020-05-27 14:54 ` [PULL 08/12] tests/docker: add debian11 base image Alex Bennée
2020-05-27 14:54 ` Alex Bennée [this message]
2020-05-27 14:54 ` [PULL 10/12] cpus-common: ensure auto-assigned cpu_indexes don't clash Alex Bennée
2020-05-27 14:54 ` [PULL 11/12] linux-user: properly "unrealize" vCPU object Alex Bennée
2020-05-27 14:54 ` [PULL 12/12] tests/tcg: add new threadcount test Alex Bennée
2020-05-28 13:54 ` [PULL 00/12] testing and plugin fixes Peter Maydell
2020-05-28 14:16   ` Alex Bennée
2020-05-28 14:57   ` Alex Bennée
2020-05-28 15:09     ` Peter Maydell
2020-05-28 15:18       ` Philippe Mathieu-Daudé
2020-05-28 15:20         ` Peter Maydell
2020-05-28 15:26           ` Philippe Mathieu-Daudé
2020-05-28 16:07             ` Peter Maydell
2020-05-28 17:19           ` Alex Bennée
2020-05-28 15:38         ` Gerd Hoffmann
2020-05-29 18:25 ` Peter Maydell

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=20200527145455.2550-10-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --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).