Commit a77312e7 authored by Thomas Huth's avatar Thomas Huth Committed by Alex Bennée
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200713185237.9419-1-thuth@redhat.com>
Message-Id: <20200713200415.26214-3-alex.bennee@linaro.org>
parent 93154e76

tests/docker/dockerfiles/ubuntu2004.docker

+0 −3
Original line number Diff line number Diff line
@@ -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