diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd/run-ptest | 1 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_208.bb | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd/run-ptest b/meta/recipes-core/systemd/systemd/run-ptest index 0418bc977b..2f6bd93a5b 100644 --- a/meta/recipes-core/systemd/systemd/run-ptest +++ b/meta/recipes-core/systemd/systemd/run-ptest @@ -1,2 +1,3 @@ +tar -C test -xJf test/sys.tar.xz make test/rules-test.sh.log make test/udev-test.pl.log diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 6590235ca7..4b0fa2d4b7 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb @@ -120,11 +120,15 @@ do_install_ptest () { install ${S}/test/* ${D}${PTEST_PATH}/test install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ install -d ${D}${PTEST_PATH}/build-aux + cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ cp -rf ${B}/rules ${D}${PTEST_PATH}/ + # This directory needs to be there for udev-test.pl to work. + install -d ${D}${libdir}/udev/rules.d cp ${B}/Makefile ${D}${PTEST_PATH}/ - cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ - tar -C ${D}${PTEST_PATH}/test -xJf ${S}/test/sys.tar.xz + cp ${S}/test/sys.tar.xz ${D}${PTEST_PATH}/test sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl + sed -i 's#${S}#${PTEST_PATH}#g' ${D}${PTEST_PATH}/Makefile + sed -i 's#${B}#${PTEST_PATH}#g' ${D}${PTEST_PATH}/Makefile } python populate_packages_prepend (){ @@ -147,6 +151,10 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze" FILES_${PN}-initramfs = "/init" RDEPENDS_${PN}-initramfs = "${PN}" +# The test cases need perl and bash to run correctly. +RDEPENDS_${PN}-ptest += "perl bash" +FILES_${PN}-ptest += "${libdir}/udev/rules.d" + FILES_${PN}-gui = "${bindir}/systemadm" FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ |