| Message ID | 20191117164452.5361-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/4] package/spice: disable tests | expand |
On Sun, 17 Nov 2019 17:44:49 +0100 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > By disabling tests, we'll remove the optional gdk-pixbuf dependency > > Fixes: > - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Disable tests instead of adding and fixing gdk-pixbuf optional > dependency I've applied to next. However, your patch to upstream is not really complete, or at least an additional patch is needed: when tests are enabled, their configure.ac script should check if gdk-pixbuf is available. And if it's not available, it should bail out, or disable tests, but not allow the configure process to complete, and then have a build failure when compiling. Thanks! Thomas
Hi Thomas, Le lun. 18 nov. 2019 à 22:47, Thomas Petazzoni <thomas.petazzoni@bootlin.com> a écrit : > > On Sun, 17 Nov 2019 17:44:49 +0100 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > > > By disabling tests, we'll remove the optional gdk-pixbuf dependency > > > > Fixes: > > - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd > > > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > > --- > > Changes v1 -> v2 (after review of Yann E. Morin): > > - Disable tests instead of adding and fixing gdk-pixbuf optional > > dependency > > I've applied to next. However, your patch to upstream is not really > complete, or at least an additional patch is needed: when tests are > enabled, their configure.ac script should check if gdk-pixbuf is > available. And if it's not available, it should bail out, or disable > tests, but not allow the configure process to complete, and then have a > build failure when compiling. You applied only the first patch of the serie and you applied it on next even if it fixes a build failure on master. Was it intentional? > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice
On Tue, 19 Nov 2019 08:47:52 +0100 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > > I've applied to next. However, your patch to upstream is not really > > complete, or at least an additional patch is needed: when tests are > > enabled, their configure.ac script should check if gdk-pixbuf is > > available. And if it's not available, it should bail out, or disable > > tests, but not allow the configure process to complete, and then have a > > build failure when compiling. > You applied only the first patch of the serie Yes, I didn't get around to applying the rest of the series. > and you applied it on next even if it fixes a build failure on master. Was it intentional? I was not sure if it was a build failure on master, and the autobuilder failure linked in the commit log (http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd) happened on the next branch. I'll cherry-pick on master. In such cases (i.e autobuilder failures happening on next, but issue also present in master), it's always good to be explicit in the patch, by adding a small note like this: """ balblabla Signed-off-by: John Doe <john.doe@foobar.org> --- The autobuilder failure linked in the commit log was for next, but the problem also exists on master. """ This would really help. Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > By disabling tests, we'll remove the optional gdk-pixbuf dependency > Fixes: > - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Disable tests instead of adding and fixing gdk-pixbuf optional > dependency Committed to 2019.02.x and 2019.08.x, thanks.
diff --git a/package/spice/0001-configure.ac-add-enable-tests.patch b/package/spice/0001-configure.ac-add-enable-tests.patch new file mode 100644 index 0000000000..668dea1ca3 --- /dev/null +++ b/package/spice/0001-configure.ac-add-enable-tests.patch @@ -0,0 +1,54 @@ +From 1b6eaf5589a14763452cbe53382cc699cdeca141 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Fri, 15 Nov 2019 11:36:14 +0100 +Subject: [PATCH] configure.ac: add --enable-tests + +Allow the user to disable tests through --disable-tests, this is +especially useful for example to disable gdk-pixbuf dependency + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: +https://gitlab.freedesktop.org/spice/spice-common/merge_requests/6] +--- + Makefile.am | 6 +++++- + configure.ac | 7 +++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/subprojects/spice-common/Makefile.am b/subprojects/spice-common/Makefile.am +index 5402499..00623a1 100644 +--- a/subprojects/spice-common/Makefile.am ++++ b/subprojects/spice-common/Makefile.am +@@ -1,7 +1,11 @@ + NULL = + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = python_modules common tests docs ++SUBDIRS = python_modules common docs ++ ++if ENABLE_TESTS ++SUBDIRS += tests ++endif + + EXTRA_DIST = \ + meson.build \ +diff --git a/subprojects/spice-common/configure.ac b/subprojects/spice-common/configure.ac +index 9d10287..2dba7c8 100644 +--- a/subprojects/spice-common/configure.ac ++++ b/subprojects/spice-common/configure.ac +@@ -33,6 +33,13 @@ AC_SEARCH_LIBS(regcomp, [regex rx]) + SPICE_CHECK_SYSDEPS + SPICE_EXTRA_CHECKS + ++AC_ARG_ENABLE([tests], ++ AS_HELP_STRING([--enable-tests], ++ [Enable tests @<:@default=yes@:>@]), ++ [], ++ enable_tests="yes") ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes") ++ + AC_ARG_ENABLE([alignment-checks], + AS_HELP_STRING([--enable-alignment-checks], + [Enable runtime checks for cast alignment @<:@default=no@:>@]), +-- +2.23.0 + diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 16e57441a8..b663479920 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -17,6 +17,8 @@ SPICE_DEPENDENCIES = \ openssl \ pixman \ spice-protocol +# We're patching subprojects/spice-common/configure.ac +SPICE_AUTORECONF = YES # We disable everything for now, because the dependency tree can become # quite deep if we try to enable some features, and I have not tested that. @@ -25,7 +27,8 @@ SPICE_CONF_OPTS = \ --disable-opengl \ --disable-smartcard \ --without-sasl \ - --disable-manual + --disable-manual \ + --disable-tests SPICE_DEPENDENCIES += host-pkgconf
By disabling tests, we'll remove the optional gdk-pixbuf dependency Fixes: - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- Changes v1 -> v2 (after review of Yann E. Morin): - Disable tests instead of adding and fixing gdk-pixbuf optional dependency .../0001-configure.ac-add-enable-tests.patch | 54 +++++++++++++++++++ package/spice/spice.mk | 5 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 package/spice/0001-configure.ac-add-enable-tests.patch