summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlex Bennée2022-03-21 17:11:51 +0100
committerPeter Maydell2022-03-22 18:07:30 +0100
commit309df6acb29346f89e1ee542b1986f60cab12b87 (patch)
tree76720b3c60b184130df5bcd669415730f74dcc3b /.travis.yml
parentMerge tag 'pull-block-2022-03-22' of https://gitlab.com/hreitz/qemu into staging (diff)
downloadqemu-309df6acb29346f89e1ee542b1986f60cab12b87.tar.gz
qemu-309df6acb29346f89e1ee542b1986f60cab12b87.tar.xz
qemu-309df6acb29346f89e1ee542b1986f60cab12b87.zip
gitlab: disable accelerated zlib for s390x
There appears to be a bug in the s390 hardware-accelerated version of zlib distributed with Ubuntu 20.04, which makes our test /i386/migration/multifd/tcp/zlib hit an assertion perhaps one time in 10. Fortunately zlib provides an escape hatch where we can disable the hardware-acceleration entirely by setting the environment variable DFLTCC to 0. Do this on all our CI which runs on s390 hosts, both our custom gitlab runner and also the Travis hosts. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Acked-by: Cornelia Huck <cohuck@redhat.com> Message-id: 20220321161151.3654386-1-alex.bennee@linaro.org Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index c3c8048842..9afc4a54b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -218,6 +218,7 @@ jobs:
- TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
- UNRELIABLE=true
+ - DFLTCC=0
script:
- BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
- |
@@ -257,7 +258,7 @@ jobs:
env:
- CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
--target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
-
+ - DFLTCC=0
- name: "[s390x] GCC (user)"
arch: s390x
dist: focal
@@ -269,7 +270,7 @@ jobs:
- ninja-build
env:
- CONFIG="--disable-containers --disable-system"
-
+ - DFLTCC=0
- name: "[s390x] Clang (disable-tcg)"
arch: s390x
dist: focal
@@ -303,3 +304,4 @@ jobs:
- CONFIG="--disable-containers --disable-tcg --enable-kvm
--disable-tools --host-cc=clang --cxx=clang++"
- UNRELIABLE=true
+ - DFLTCC=0