diff options
author | Ross Burton <ross.burton@intel.com> | 2017-03-10 14:43:45 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-11 16:09:14 +0000 |
commit | 60558c15443ed64c8203fada97040e7586b94bed (patch) | |
tree | 829a8f8fd51f12a554078d7e2f3bb1324e22aa5d /meta/recipes-core | |
parent | b89d6500ff0059f22c640a46beff91c6f372033d (diff) | |
download | poky-60558c15443ed64c8203fada97040e7586b94bed.tar.gz |
glib-2.0: improve determinism for GIO ptests
Previously the GIO tests would be built or not depending on whether the host had
a dbus-daemon binary available. Fix this by seeding the AC_CHECK_PROGS check
with the right value, and adding a RDEPENDS for dbus-daemon on the target.
(From OE-Core rev: 1944c9a1764105c15844c7dbf1d430389c02b631)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 6600d33dcd..e8cdefdede 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -45,6 +45,9 @@ EXTRA_OECONF = "${PRINTF} ${CORECONF}" | |||
45 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | 45 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
46 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" | 46 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" |
47 | 47 | ||
48 | # Tell configure that we'll have dbus-daemon on the target for the tests | ||
49 | EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" | ||
50 | |||
48 | do_configure_prepend() { | 51 | do_configure_prepend() { |
49 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | 52 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in |
50 | } | 53 | } |
@@ -113,6 +116,7 @@ do_install_append_class-target () { | |||
113 | } | 116 | } |
114 | 117 | ||
115 | RDEPENDS_${PN}-ptest += "\ | 118 | RDEPENDS_${PN}-ptest += "\ |
119 | dbus \ | ||
116 | gnome-desktop-testing \ | 120 | gnome-desktop-testing \ |
117 | tzdata \ | 121 | tzdata \ |
118 | tzdata-americas \ | 122 | tzdata-americas \ |