diff options
Diffstat (limited to 'meta/recipes-core/dbus')
| -rw-r--r-- | meta/recipes-core/dbus/dbus-test_1.12.12.bb | 13 | ||||
| -rwxr-xr-x | meta/recipes-core/dbus/dbus/run-ptest | 16 |
2 files changed, 22 insertions, 7 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.12.bb b/meta/recipes-core/dbus/dbus-test_1.12.12.bb index f4131926c2..0502c44917 100644 --- a/meta/recipes-core/dbus/dbus-test_1.12.12.bb +++ b/meta/recipes-core/dbus/dbus-test_1.12.12.bb @@ -33,13 +33,14 @@ EXTRA_OECONF = "--enable-tests \ --enable-installed-tests \ --enable-checks \ --enable-asserts \ - --enable-verbose-mode \ --enable-largefile \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ --with-dbus-test-dir=${PTEST_PATH} \ - ${EXTRA_OECONF_X}" + ${EXTRA_OECONF_X} \ + --enable-embedded-tests \ + " EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" @@ -50,6 +51,7 @@ PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" +PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," do_install() { : @@ -58,12 +60,17 @@ 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 " + 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 diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest index 353ba1e905..cf2e68fa02 100755 --- a/meta/recipes-core/dbus/dbus/run-ptest +++ b/meta/recipes-core/dbus/dbus/run-ptest @@ -17,8 +17,16 @@ export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs files=`ls test/test-*` for i in $files - do - ./$i ./test/data >/dev/null - output - done +do + #these programs are used by testcase test-bus, don't run here + if [ $i = "test/test-service" ] \ + || [ $i = "test/test-shell-service" ] \ + || [ $i = "test/test-segfault" ] + then + continue + fi + + ./$i ./test/data >/dev/null 2>&1 + output +done |