summaryrefslogtreecommitdiffstats
path: root/tests/docker/dockerfiles
diff options
context:
space:
mode:
authorThomas Huth2020-12-15 09:34:51 +0100
committerPaolo Bonzini2021-01-02 21:03:09 +0100
commitee381b7fe1469d6ef4e11675608118eca7bc8f05 (patch)
tree4ae61ffac1e3853bc76bff77aa3b906bc933beaf /tests/docker/dockerfiles
parenttests/tcg: build tests with -Werror (diff)
downloadqemu-ee381b7fe1469d6ef4e11675608118eca7bc8f05.tar.gz
qemu-ee381b7fe1469d6ef4e11675608118eca7bc8f05.tar.xz
qemu-ee381b7fe1469d6ef4e11675608118eca7bc8f05.zip
gitlab-CI: Test 32-bit builds with the fedora-i386-cross container
After adding some missing packages, it's possible to check 32-bit builds and tests with the fedora-i386-cross container in the gitlab-CI, too. Unfortunately, the code in subprojects/ ignores the --extra-cflags (on purpose), so the vhost-user part has to be disabled for this. While we're at it, update the container to Fedora 31. Unfortunately the gcc from the later versions emits some very dubious format-truncation warnings, so Fedora 32 and 33 are currently unsuitable for this job. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Message-Id: <20201215083451.92322-1-thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles')
-rw-r--r--tests/docker/dockerfiles/fedora-i386-cross.docker18
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index cd16cd1bfa..a6e411291b 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,14 +1,26 @@
-FROM fedora:30
+FROM fedora:31
ENV PACKAGES \
+ bzip2 \
+ diffutils \
+ findutils \
gcc \
+ git \
+ libtasn1-devel.i686 \
+ libzstd-devel.i686 \
+ make \
+ meson \
+ ninja-build \
glib2-devel.i686 \
glibc-devel.i686 \
glibc-static.i686 \
gnutls-devel.i686 \
nettle-devel.i686 \
+ perl-Test-Harness \
pixman-devel.i686 \
- zlib-devel.i686 \
- libzstd-devel.i686
+ zlib-devel.i686
+
+ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user
+ENV PKG_CONFIG_PATH /usr/lib/pkgconfig
RUN dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt