diff options
Diffstat (limited to 'meta/recipes-core/dbus')
| -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 |
4 files changed, 10 insertions, 106 deletions
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 @@ -SUMMARY = "D-Bus test package (for D-bus functionality testing only)" -HOMEPAGE = "http://dbus.freedesktop.org" -SECTION = "base" - -require dbus.inc - -SRC_URI += "file://run-ptest \ - file://python-config.patch \ - " - -DEPENDS = "dbus glib-2.0" - -RDEPENDS:${PN}-dev = "" - -S="${WORKDIR}/dbus-${PV}" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" - -inherit ptest - -EXTRA_OECONF += "--enable-tests \ - --enable-modular-tests \ - --enable-installed-tests \ - --enable-checks \ - --enable-asserts \ - --with-dbus-test-dir=${PTEST_PATH} \ - --enable-embedded-tests \ - " - -do_install() { - : -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - l="shell printf refs syslog marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay \ - variant uid-permissions syntax spawn sd-activation names monitor message fdpass service shell-service" - for i in $l; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done - - l="bus bus-system bus-launch-helper" - for i in $l; do install ${B}/bus/.libs/test-$i ${D}${PTEST_PATH}/test; done - - install -d ${D}${PTEST_PATH}/bus - install ${B}/bus/.libs/dbus-daemon-launch-helper-test ${D}${PTEST_PATH}/bus - - install ${B}/test/test-segfault ${D}${PTEST_PATH}/test - - cp -r ${B}/test/data ${D}${PTEST_PATH}/test - install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test - - install -d ${D}${PTEST_PATH}/test/.libs - cp -a ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs - - # Remove build host references... - find "${D}${PTEST_PATH}/test/data" \( -name *.service -o -name *.conf -o -name "*.aaprofile" \) -type f -exec \ - sed -i \ - -e 's:${B}:${PTEST_PATH}:g' \ - {} + - sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest -} - -RDEPENDS:${PN}-ptest += "bash make dbus" -RDEPENDS:${PN}-ptest:remove = "${PN}" - -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 @@ -inherit autotools pkgconfig gettext upstream-version-is-even +inherit autotools pkgconfig gettext upstream-version-is-even ptest-gnome LICENSE = "AFL-2.1 | GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://run-ptest \ + file://python-config.patch \ file://tmpdir.patch \ file://dbus-1.init \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ @@ -17,6 +19,9 @@ EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ --enable-largefile \ --with-system-socket=/run/dbus/system_bus_socket \ + --enable-tests \ + --enable-checks \ + --enable-asserts \ " EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" 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 @@ #!/bin/sh - -output() { - retcode=$? - if [ $retcode -eq 0 ] - then echo "PASS: $i" - elif [ $retcode -eq 77 ] - then echo "SKIP: $i" - else echo "FAIL: $i" - fi -} - -export DBUS_TEST_HOMEDIR=./test -export XDG_RUNTIME_DIR=./test -export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs - -files=`ls test/test-*` - -for i in $files -do - #these programs are used by testcase test-bus, don't run here - #additionally, test-names needs to be run under X - if [ $i = "test/test-service" ] \ - || [ $i = "test/test-shell-service" ] \ - || [ $i = "test/test-segfault" ] \ - || [ $i = "test/test-bus" ] \ - || [ $i = "test/test-names" ] - then - continue - fi - - ./$i ./test/data >/dev/null 2>&1 - output -done +gnome-desktop-testing-runner dbus 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" |