diff mbox series

[v5,57/57] gitlab: Enable cross-i386 builds of TCI

Message ID 20210311143958.562625-58-richard.henderson@linaro.org
State New
Headers show
Series TCI fixes and cleanups | expand

Commit Message

Richard Henderson March 11, 2021, 2:39 p.m. UTC 
We're currently only testing TCI with a 64-bit host -- also test
with a 32-bit host.  Enable a selection of softmmu and user-only
targets, 32-bit LE, 64-bit LE, 32-bit BE, as there are ifdefs for each.

Acked-by: Thomas Huth <thuth@redhat.com>

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

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 .gitlab-ci.d/crossbuilds.yml                      | 11 ++++++++++-
 tests/docker/dockerfiles/fedora-i386-cross.docker |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

-- 
2.25.1

Comments

Philippe Mathieu-Daudé May 27, 2021, 3:57 p.m. UTC | #1 
On Thu, Mar 11, 2021 at 3:43 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
>

> We're currently only testing TCI with a 64-bit host -- also test

> with a 32-bit host.  Enable a selection of softmmu and user-only

> targets, 32-bit LE, 64-bit LE, 32-bit BE, as there are ifdefs for each.

>

> Acked-by: Thomas Huth <thuth@redhat.com>

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

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  .gitlab-ci.d/crossbuilds.yml                      | 11 ++++++++++-

>  tests/docker/dockerfiles/fedora-i386-cross.docker |  1 +

>  2 files changed, 11 insertions(+), 1 deletion(-)


Thanks, patch applied to gitlab-ci-next.
diff mbox series

Patch

diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index d573e431e5..099f2ef2e5 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -27,7 +27,7 @@ 
     - PKG_CONFIG_PATH=$PKG_CONFIG_PATH
       ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools
         --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
-    - make -j$(expr $(nproc) + 1) all check-build
+    - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
 
 .cross_user_build_job:
   stage: build
@@ -97,6 +97,15 @@  cross-i386-user:
     IMAGE: fedora-i386-cross
     MAKE_CHECK_ARGS: check
 
+cross-i386-tci:
+  extends: .cross_accel_build_job
+  timeout: 60m
+  variables:
+    IMAGE: fedora-i386-cross
+    ACCEL: tcg-interpreter
+    EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user
+    MAKE_CHECK_ARGS: check check-tcg
+
 cross-mips-system:
   extends: .cross_system_build_job
   needs:
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 966072c08e..b620d7664d 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -5,6 +5,7 @@  ENV PACKAGES \
     findutils \
     gcc \
     git \
+    libffi-devel.i686 \
     libtasn1-devel.i686 \
     libzstd-devel.i686 \
     make \