[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20
From: |
Alex Bennée |
Subject: |
[PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image |
Date: |
Tue, 14 Jul 2020 10:52:41 +0100 |
From: Thomas Huth <thuth@redhat.com>
The libssh problem only exists in Ubuntu 18.04 - we can enable it
in 20.04 again.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200713185237.9419-1-thuth@redhat.com>
Message-Id: <20200713200415.26214-3-alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
b/tests/docker/dockerfiles/ubuntu2004.docker
index f7aac840bf..8d10934a2a 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -65,9 +65,6 @@ RUN apt-get update && \
RUN dpkg -l $PACKAGES | sort > /packages.txt
ENV FEATURES clang tsan pyyaml sdl2
-# https://bugs.launchpad.net/qemu/+bug/1838763
-ENV QEMU_CONFIGURE_OPTS --disable-libssh
-
# Apply patch https://reviews.llvm.org/D75820
# This is required for TSan in clang-10 to compile with QEMU.
RUN sed -i 's/^const/static const/g'
/usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h
--
2.20.1
- [PULL 0/9] final misc fixes for 5.1-rc0, Alex Bennée, 2020/07/14
- [PULL 1/9] docs/devel: fix grammar in multi-thread-tcg, Alex Bennée, 2020/07/14
- [PULL 2/9] configure: remove all dependencies on a (re)configure, Alex Bennée, 2020/07/14
- [PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image,
Alex Bennée <=
- [PULL 4/9] docker.py: fix fetching of FROM layers, Alex Bennée, 2020/07/14
- [PULL 6/9] fpu/softfloat: fix up float16 nan recognition, Alex Bennée, 2020/07/14
- [PULL 5/9] gitlab-ci/containers: Add missing wildcard where we should look for changes, Alex Bennée, 2020/07/14
- [PULL 7/9] tests/plugins: don't unconditionally add -Wpsabi, Alex Bennée, 2020/07/14
- [PULL 8/9] cputlb: ensure we save the IOTLB data in case of reset, Alex Bennée, 2020/07/14
- [PULL 9/9] plugins: expand the bb plugin to be thread safe and track per-cpu, Alex Bennée, 2020/07/14
- Re: [PULL 0/9] final misc fixes for 5.1-rc0, Peter Maydell, 2020/07/15