[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen master] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image



commit a77312e77c7d19702aa4e2ddefd20cae060a7fb9
Author:     Thomas Huth <thuth@xxxxxxxxxx>
AuthorDate: Mon Jul 13 21:04:06 2020 +0100
Commit:     Alex Bennée <alex.bennee@xxxxxxxxxx>
CommitDate: Wed Jul 15 11:52:43 2020 +0100

    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@xxxxxxxxxx>
    Signed-off-by: Alex Bennée <alex.bennee@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
    Message-Id: <20200713185237.9419-1-thuth@xxxxxxxxxx>
    Message-Id: <20200713200415.26214-3-alex.bennee@xxxxxxxxxx>
---
 tests/docker/dockerfiles/ubuntu2004.docker | 3 ---
 1 file changed, 3 deletions(-)

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
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.