diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-03-09 23:22:12 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-15 08:38:28 +0000 |
| commit | cfecef4e6925865961858d0fe5ffc7794c71cd3b (patch) | |
| tree | 828ea12f74edf402b9020646c27d704fdc496e90 /meta/recipes-core/dbus/dbus_1.12.22.bb | |
| parent | d81704057950e1970ef7f673fa771834fd2b3f1e (diff) | |
| download | openembedded-core-contrib-cfecef4e6925865961858d0fe5ffc7794c71cd3b.tar.gz | |
dbus-test: merge into main dbus recipe
The reason it was separate is that there is a peculiar circular
dependency: dbus tests require glib, while some of glib's gdbus tests
require dbus. So dbus was built with tests disabled and without glib
dependency, then glib was built with dbus dependency, then dbus was
built again with glib dependency and tests enabled, only for the purpose
of installing those tests. I find that brittle and hacky, so this
removes dbus dependecy from glib (the fallout is that some gdbus tests
are no longer being executed), and dbus and its tests are built once,
after glib. Conversely, dbus is now dependent on glib for the purpose
of building the tests.
Also, dbus ptest installation is no longer using custom code, and dbus
run-ptest simply uses standard installed tests execution mechanism from
gnome.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus_1.12.22.bb')
| -rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.22.bb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.12.22.bb b/meta/recipes-core/dbus/dbus_1.12.22.bb index 48947209d9..e611e7d98a 100644 --- a/meta/recipes-core/dbus/dbus_1.12.22.bb +++ b/meta/recipes-core/dbus/dbus_1.12.22.bb @@ -5,10 +5,7 @@ SECTION = "base" require dbus.inc -DEPENDS = "expat virtual/libintl autoconf-archive" -PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" -ALLOW_EMPTY:dbus-ptest = "1" -RDEPENDS:dbus-ptest:class-target = "dbus-test-ptest" +DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" RDEPENDS:${PN} += "${PN}-common ${PN}-tools" RDEPENDS:${PN}:class-native = "" @@ -73,6 +70,8 @@ FILES:${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS:${PN}-lib = "${PN}" FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" +RDEPENDS:${PN}-ptest += "bash make dbus" + PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" pkg_postinst:dbus() { # If both systemd and sysvinit are enabled, mask the dbus-1 init script @@ -89,8 +88,6 @@ pkg_postinst:dbus() { } -EXTRA_OECONF += "--disable-tests" - do_install() { autotools_do_install @@ -149,5 +146,3 @@ do_install:class-nativesdk() { rm -rf ${D}${localstatedir}/run } BBCLASSEXTEND = "native nativesdk" - -INSANE_SKIP:${PN}-ptest += "build-deps" |