diff options
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.12.22.bb | 64 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 7 | ||||
-rwxr-xr-x | meta/recipes-core/dbus/dbus/run-ptest | 34 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.22.bb | 11 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
7 files changed, 12 insertions, 109 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 \ |
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.22.bb b/meta/recipes-core/dbus/dbus-test_1.12.22.bb deleted file mode 100644 index ae70301431..0000000000 --- a/meta/recipes-core/dbus/dbus-test_1.12.22.bb +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | SUMMARY = "D-Bus test package (for D-bus functionality testing only)" | ||
2 | HOMEPAGE = "http://dbus.freedesktop.org" | ||
3 | SECTION = "base" | ||
4 | |||
5 | require dbus.inc | ||
6 | |||
7 | SRC_URI += "file://run-ptest \ | ||
8 | file://python-config.patch \ | ||
9 | " | ||
10 | |||
11 | DEPENDS = "dbus glib-2.0" | ||
12 | |||
13 | RDEPENDS:${PN}-dev = "" | ||
14 | |||
15 | S="${WORKDIR}/dbus-${PV}" | ||
16 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" | ||
17 | |||
18 | inherit ptest | ||
19 | |||
20 | EXTRA_OECONF += "--enable-tests \ | ||
21 | --enable-modular-tests \ | ||
22 | --enable-installed-tests \ | ||
23 | --enable-checks \ | ||
24 | --enable-asserts \ | ||
25 | --with-dbus-test-dir=${PTEST_PATH} \ | ||
26 | --enable-embedded-tests \ | ||
27 | " | ||
28 | |||
29 | do_install() { | ||
30 | : | ||
31 | } | ||
32 | |||
33 | do_install_ptest() { | ||
34 | install -d ${D}${PTEST_PATH}/test | ||
35 | l="shell printf refs syslog marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay \ | ||
36 | variant uid-permissions syntax spawn sd-activation names monitor message fdpass service shell-service" | ||
37 | for i in $l; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done | ||
38 | |||
39 | l="bus bus-system bus-launch-helper" | ||
40 | for i in $l; do install ${B}/bus/.libs/test-$i ${D}${PTEST_PATH}/test; done | ||
41 | |||
42 | install -d ${D}${PTEST_PATH}/bus | ||
43 | install ${B}/bus/.libs/dbus-daemon-launch-helper-test ${D}${PTEST_PATH}/bus | ||
44 | |||
45 | install ${B}/test/test-segfault ${D}${PTEST_PATH}/test | ||
46 | |||
47 | cp -r ${B}/test/data ${D}${PTEST_PATH}/test | ||
48 | install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test | ||
49 | |||
50 | install -d ${D}${PTEST_PATH}/test/.libs | ||
51 | cp -a ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs | ||
52 | |||
53 | # Remove build host references... | ||
54 | find "${D}${PTEST_PATH}/test/data" \( -name *.service -o -name *.conf -o -name "*.aaprofile" \) -type f -exec \ | ||
55 | sed -i \ | ||
56 | -e 's:${B}:${PTEST_PATH}:g' \ | ||
57 | {} + | ||
58 | sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest | ||
59 | } | ||
60 | |||
61 | RDEPENDS:${PN}-ptest += "bash make dbus" | ||
62 | RDEPENDS:${PN}-ptest:remove = "${PN}" | ||
63 | |||
64 | PRIVATE_LIBS:${PN}-ptest = "libdbus-1.so.3" | ||
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index cb4c56db92..8e6f597c0a 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -1,10 +1,12 @@ | |||
1 | inherit autotools pkgconfig gettext upstream-version-is-even | 1 | inherit autotools pkgconfig gettext upstream-version-is-even ptest-gnome |
2 | 2 | ||
3 | LICENSE = "AFL-2.1 | GPL-2.0-or-later" | 3 | LICENSE = "AFL-2.1 | GPL-2.0-or-later" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ |
5 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | 5 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" |
6 | 6 | ||
7 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | 7 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ |
8 | file://run-ptest \ | ||
9 | file://python-config.patch \ | ||
8 | file://tmpdir.patch \ | 10 | file://tmpdir.patch \ |
9 | file://dbus-1.init \ | 11 | file://dbus-1.init \ |
10 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | 12 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ |
@@ -17,6 +19,9 @@ EXTRA_OECONF = "--disable-xml-docs \ | |||
17 | --disable-doxygen-docs \ | 19 | --disable-doxygen-docs \ |
18 | --enable-largefile \ | 20 | --enable-largefile \ |
19 | --with-system-socket=/run/dbus/system_bus_socket \ | 21 | --with-system-socket=/run/dbus/system_bus_socket \ |
22 | --enable-tests \ | ||
23 | --enable-checks \ | ||
24 | --enable-asserts \ | ||
20 | " | 25 | " |
21 | EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" | 26 | EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" |
22 | 27 | ||
diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest index d3eec08235..54f43e1f68 100755 --- a/meta/recipes-core/dbus/dbus/run-ptest +++ b/meta/recipes-core/dbus/dbus/run-ptest | |||
@@ -1,35 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | gnome-desktop-testing-runner dbus | |
3 | output() { | ||
4 | retcode=$? | ||
5 | if [ $retcode -eq 0 ] | ||
6 | then echo "PASS: $i" | ||
7 | elif [ $retcode -eq 77 ] | ||
8 | then echo "SKIP: $i" | ||
9 | else echo "FAIL: $i" | ||
10 | fi | ||
11 | } | ||
12 | |||
13 | export DBUS_TEST_HOMEDIR=./test | ||
14 | export XDG_RUNTIME_DIR=./test | ||
15 | export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs | ||
16 | |||
17 | files=`ls test/test-*` | ||
18 | |||
19 | for i in $files | ||
20 | do | ||
21 | #these programs are used by testcase test-bus, don't run here | ||
22 | #additionally, test-names needs to be run under X | ||
23 | if [ $i = "test/test-service" ] \ | ||
24 | || [ $i = "test/test-shell-service" ] \ | ||
25 | || [ $i = "test/test-segfault" ] \ | ||
26 | || [ $i = "test/test-bus" ] \ | ||
27 | || [ $i = "test/test-names" ] | ||
28 | then | ||
29 | continue | ||
30 | fi | ||
31 | |||
32 | ./$i ./test/data >/dev/null 2>&1 | ||
33 | output | ||
34 | done | ||
35 | 3 | ||
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" | |||
5 | 5 | ||
6 | require dbus.inc | 6 | require dbus.inc |
7 | 7 | ||
8 | DEPENDS = "expat virtual/libintl autoconf-archive" | 8 | DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" |
9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | ||
10 | ALLOW_EMPTY:dbus-ptest = "1" | ||
11 | RDEPENDS:dbus-ptest:class-target = "dbus-test-ptest" | ||
12 | RDEPENDS:${PN} += "${PN}-common ${PN}-tools" | 9 | RDEPENDS:${PN} += "${PN}-common ${PN}-tools" |
13 | RDEPENDS:${PN}:class-native = "" | 10 | RDEPENDS:${PN}:class-native = "" |
14 | 11 | ||
@@ -73,6 +70,8 @@ FILES:${PN}-lib = "${libdir}/lib*.so.*" | |||
73 | RRECOMMENDS:${PN}-lib = "${PN}" | 70 | RRECOMMENDS:${PN}-lib = "${PN}" |
74 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" | 71 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" |
75 | 72 | ||
73 | RDEPENDS:${PN}-ptest += "bash make dbus" | ||
74 | |||
76 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" | 75 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" |
77 | pkg_postinst:dbus() { | 76 | pkg_postinst:dbus() { |
78 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script | 77 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script |
@@ -89,8 +88,6 @@ pkg_postinst:dbus() { | |||
89 | } | 88 | } |
90 | 89 | ||
91 | 90 | ||
92 | EXTRA_OECONF += "--disable-tests" | ||
93 | |||
94 | do_install() { | 91 | do_install() { |
95 | autotools_do_install | 92 | autotools_do_install |
96 | 93 | ||
@@ -149,5 +146,3 @@ do_install:class-nativesdk() { | |||
149 | rm -rf ${D}${localstatedir}/run | 146 | rm -rf ${D}${localstatedir}/run |
150 | } | 147 | } |
151 | BBCLASSEXTEND = "native nativesdk" | 148 | BBCLASSEXTEND = "native nativesdk" |
152 | |||
153 | INSANE_SKIP:${PN}-ptest += "build-deps" | ||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 268e48a088..6e20d40dac 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -43,7 +43,7 @@ PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" | |||
43 | PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" | 43 | PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" |
44 | # libelf is auto-detected without a configuration option | 44 | # libelf is auto-detected without a configuration option |
45 | PACKAGECONFIG[libelf] = ",,elfutils" | 45 | PACKAGECONFIG[libelf] = ",,elfutils" |
46 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" | 46 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," |
47 | PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" | 47 | PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" |
48 | 48 | ||
49 | EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false" | 49 | EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false" |