diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-03-16 13:25:39 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2018-06-05 16:25:42 +0100 |
| commit | cabd35840749dc4ddbc866a21f635d20374af743 (patch) | |
| tree | 9242532778100dd1473c9682300e4d82974c6542 /tests/docker | |
| parent | 8bce19d3a6abc35c8680e22e7b7687a6846d46cd (diff) | |
| download | qemu-cabd35840749dc4ddbc866a21f635d20374af743.zip qemu-cabd35840749dc4ddbc866a21f635d20374af743.tar.gz qemu-cabd35840749dc4ddbc866a21f635d20374af743.tar.bz2 | |
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: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[AJB: fix merge conflicts]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/fedora.docker | 8 | ||||
| -rwxr-xr-x | tests/docker/test-mingw | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 65d7761..7d1d008 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -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 diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 503a6bc..7cca7e1 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -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 |