diff options
| author | Thomas Huth <thuth@redhat.com> | 2020-07-13 21:04:06 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2020-07-15 11:52:43 +0100 |
| commit | a77312e77c7d19702aa4e2ddefd20cae060a7fb9 (patch) | |
| tree | 1449909071b4cbd99ebdab377040319e88570733 /tests/docker | |
| parent | 93154e767f1b886e6d258178821d400333042a22 (diff) | |
| download | qemu-a77312e77c7d19702aa4e2ddefd20cae060a7fb9.zip qemu-a77312e77c7d19702aa4e2ddefd20cae060a7fb9.tar.gz qemu-a77312e77c7d19702aa4e2ddefd20cae060a7fb9.tar.bz2 | |
tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
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>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu2004.docker | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index f7aac84..8d10934 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 |