Skip to content

Commit a77312e

Browse files
huthstsquad
authored andcommitted
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 <[email protected]> Signed-off-by: Alex Bennée <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> Message-Id: <[email protected]>
1 parent 93154e7 commit a77312e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

tests/docker/dockerfiles/ubuntu2004.docker

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ RUN apt-get update && \
6565
RUN dpkg -l $PACKAGES | sort > /packages.txt
6666
ENV FEATURES clang tsan pyyaml sdl2
6767

68-
# https://bugs.launchpad.net/qemu/+bug/1838763
69-
ENV QEMU_CONFIGURE_OPTS --disable-libssh
70-
7168
# Apply patch https://reviews.llvm.org/D75820
7269
# This is required for TSan in clang-10 to compile with QEMU.
7370
RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h

0 commit comments

Comments
 (0)