| Message ID | 20180316122540.28409-2-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 16, 2018 at 01:25:39PM +0100, Paolo Bonzini wrote: > 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> > --- > tests/docker/dockerfiles/fedora.docker | 8 ++++---- > tests/docker/test-mingw | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
On 03/16/2018 01:25 PM, Paolo Bonzini wrote: > 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). Good idea to start a doc/test/docker-coverage.txt with a matrix of configs tested (for example debian-amd64 tests virgl and netmap). > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > tests/docker/dockerfiles/fedora.docker | 8 ++++---- > 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 a00004319e..be3566325c 100644 > --- a/tests/docker/dockerfiles/fedora.docker > +++ b/tests/docker/dockerfiles/fedora.docker > @@ -4,12 +4,12 @@ ENV PACKAGES \ > glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ > gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \ > nettle-devel libasan libubsan \ > - 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 503a6bc6f7..7cca7e16a6 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 > >
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index a00004319e..be3566325c 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -4,12 +4,12 @@ ENV PACKAGES \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \ nettle-devel libasan libubsan \ - 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 503a6bc6f7..7cca7e16a6 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
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> --- tests/docker/dockerfiles/fedora.docker | 8 ++++---- tests/docker/test-mingw | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)