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:40:09 +0000 |
| commit | 73673240555a5cf446edc8512a16228cf0ef6241 (patch) | |
| tree | 393e6cbd238e6f86ca37542041af4df7ab5e5019 /meta/conf | |
| parent | 5d11e2028e9674df2a548ea93f1d6a4351973038 (diff) | |
| download | poky-73673240555a5cf446edc8512a16228cf0ef6241.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.
(From OE-Core rev: cfecef4e6925865961858d0fe5ffc7794c71cd3b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
| -rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 3fceb6701b..a8eceaadf4 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
| @@ -134,7 +134,6 @@ RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton <ross.burton@arm.com>" | |||
| 134 | RECIPE_MAINTAINER:pn-db = "Unassigned <unassigned@yoctoproject.org>" | 134 | RECIPE_MAINTAINER:pn-db = "Unassigned <unassigned@yoctoproject.org>" |
| 135 | RECIPE_MAINTAINER:pn-dbus = "Chen Qi <Qi.Chen@windriver.com>" | 135 | RECIPE_MAINTAINER:pn-dbus = "Chen Qi <Qi.Chen@windriver.com>" |
| 136 | RECIPE_MAINTAINER:pn-dbus-glib = "Chen Qi <Qi.Chen@windriver.com>" | 136 | RECIPE_MAINTAINER:pn-dbus-glib = "Chen Qi <Qi.Chen@windriver.com>" |
| 137 | RECIPE_MAINTAINER:pn-dbus-test = "Chen Qi <Qi.Chen@windriver.com>" | ||
| 138 | RECIPE_MAINTAINER:pn-dbus-wait = "Chen Qi <Qi.Chen@windriver.com>" | 137 | RECIPE_MAINTAINER:pn-dbus-wait = "Chen Qi <Qi.Chen@windriver.com>" |
| 139 | RECIPE_MAINTAINER:pn-debianutils = "Yi Zhao <yi.zhao@windriver.com>" | 138 | RECIPE_MAINTAINER:pn-debianutils = "Yi Zhao <yi.zhao@windriver.com>" |
| 140 | RECIPE_MAINTAINER:pn-dejagnu = "Nathan Rossi <nathan@nathanrossi.com>" | 139 | RECIPE_MAINTAINER:pn-dejagnu = "Nathan Rossi <nathan@nathanrossi.com>" |
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index c503a6a594..402fb87a3c 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
| @@ -76,7 +76,7 @@ PTESTS_SLOW = "\ | |||
| 76 | babeltrace2-ptest \ | 76 | babeltrace2-ptest \ |
| 77 | busybox-ptest \ | 77 | busybox-ptest \ |
| 78 | coreutils-ptest \ | 78 | coreutils-ptest \ |
| 79 | dbus-test-ptest \ | 79 | dbus-ptest \ |
| 80 | e2fsprogs-ptest \ | 80 | e2fsprogs-ptest \ |
| 81 | findutils-ptest \ | 81 | findutils-ptest \ |
| 82 | glib-2.0-ptest \ | 82 | glib-2.0-ptest \ |