| Message ID | 20191211134506.1803403-8-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add dbus-vmstate | expand |
On Wed, Dec 11, 2019 at 05:45:05PM +0400, Marc-André Lureau wrote: > To get dbus-vmstate test covered. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > tests/docker/dockerfiles/centos7.docker | 1 + > tests/docker/dockerfiles/debian10.docker | 1 + > tests/docker/dockerfiles/fedora.docker | 1 + > tests/docker/dockerfiles/ubuntu.docker | 1 + > 4 files changed, 4 insertions(+) For docker Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Does it need adding to travis, gitlab, shippable, etc CI configs too ? Regards, Daniel
Hi On Thu, Dec 12, 2019 at 4:07 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > > On Wed, Dec 11, 2019 at 05:45:05PM +0400, Marc-André Lureau wrote: > > To get dbus-vmstate test covered. > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > tests/docker/dockerfiles/centos7.docker | 1 + > > tests/docker/dockerfiles/debian10.docker | 1 + > > tests/docker/dockerfiles/fedora.docker | 1 + > > tests/docker/dockerfiles/ubuntu.docker | 1 + > > 4 files changed, 4 insertions(+) > > For docker > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > Does it need adding to travis, gitlab, shippable, etc CI configs > too ? Those are all good, only shippable has an issue with w64 build: backends/dbus-vmstate.c:313:22: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'gsize {aka long long unsigned int}' [-Werror=format=] error_report("%s: Too large vmstate data to save: %" G_GSIZE_FORMAT, This seems to be a MXE build issue, since build correctly includes "/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0", and fedora mingw works. Philippe, any idea? And I didn't manage to run a Cirrus CI build, help welcome.
On Thu, Dec 19, 2019 at 04:23:48PM +0400, Marc-André Lureau wrote: > Hi > > On Thu, Dec 12, 2019 at 4:07 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > > > > On Wed, Dec 11, 2019 at 05:45:05PM +0400, Marc-André Lureau wrote: > > > To get dbus-vmstate test covered. > > > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > > --- > > > tests/docker/dockerfiles/centos7.docker | 1 + > > > tests/docker/dockerfiles/debian10.docker | 1 + > > > tests/docker/dockerfiles/fedora.docker | 1 + > > > tests/docker/dockerfiles/ubuntu.docker | 1 + > > > 4 files changed, 4 insertions(+) > > > > For docker > > > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > > > > Does it need adding to travis, gitlab, shippable, etc CI configs > > too ? > > Those are all good, only shippable has an issue with w64 build: > > backends/dbus-vmstate.c:313:22: error: format '%u' expects argument of > type 'unsigned int', but argument 3 has type 'gsize {aka long long > unsigned int}' [-Werror=format=] > error_report("%s: Too large vmstate data to save: %" G_GSIZE_FORMAT, > > This seems to be a MXE build issue, since build correctly includes > "/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0", and > fedora mingw works. Philippe, any idea? There was a bug with one release of glib where they changed the printf function annotations, but messed up so G_*_FORMAT was changed when built with meson, but not changed when built with autotools. So if MXE uses that broken glib version & builds mingw with autotools instead of meson it will be impacted: https://gitlab.gnome.org/GNOME/glib/issues/1497 Regards, Daniel
diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index 953637065c..562d65be9e 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -8,6 +8,7 @@ ENV PACKAGES \ bzip2-devel \ ccache \ csnappy-devel \ + dbus-daemon \ flex \ gcc-c++ \ gcc \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index dad498b52e..5de79ae552 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -21,6 +21,7 @@ RUN apt update && \ build-essential \ ca-certificates \ clang \ + dbus \ flex \ gettext \ git \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4ddc7dd112..4fb1215520 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -9,6 +9,7 @@ ENV PACKAGES \ ccache \ clang \ cyrus-sasl-devel \ + dbus-daemon \ device-mapper-multipath-devel \ findutils \ flex \ diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index f486492224..2182edadea 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -13,6 +13,7 @@ FROM ubuntu:19.04 ENV PACKAGES flex bison \ ccache \ clang \ + dbus \ gcc \ gettext \ git \
To get dbus-vmstate test covered. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- tests/docker/dockerfiles/centos7.docker | 1 + tests/docker/dockerfiles/debian10.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/ubuntu.docker | 1 + 4 files changed, 4 insertions(+)