Commit cabd3584 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Alex Bennée
Browse files

docker: test-mingw: use SDL2 and GTK+3 



Do not test the deprecated API versions.  debian-win32-cross and debian-win64-cross
are already using SDL2 (they do not cover GTK+ at all).

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
[AJB: fix merge conflicts]
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent 8bce19d3

tests/docker/dockerfiles/fedora.docker

+4 −4
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ ENV PACKAGES \ 
    numactl-devel SDL2-devel snappy-devel spice-server-devel \

    systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \

    xen-devel \

    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \

    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \

    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \

    mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \

    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \

    mingw32-bzip2 \

    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \

    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \

    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \

    mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \

    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \

    mingw64-bzip2

ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3

tests/docker/test-mingw

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do 
        --enable-vnc \

        --enable-bzip2 \

        --enable-guest-agent \

        --with-sdlabi=1.2 \

        --with-gtkabi=2.0

        --with-sdlabi=2.0 \

        --with-gtkabi=3.0

    install_qemu

    make clean