summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-12-23 03:17:18 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 00:52:31 +0000
commit519ec0e56723231fe4cb88fc815a2a6a8754f044 (patch)
tree6f1f538b3f0179f4d44f1631324f102a0b115aa8
parent5612e2652dd9b23412e4f9903c5d98c27939b5da (diff)
downloadpoky-519ec0e56723231fe4cb88fc815a2a6a8754f044.tar.gz
systemd: fix ptest to make it able to run on target
This patch mainly involves four changes. 1. Ship the sys.tar.xz and extract it on target to avoid ELOOP error. 2. Make systemd-ptest rdepend on bash and perl as the test cases need them. 3. Fix paths in Makefile so that the test cases could run on target. 4. Install ${libdir}/udev/rules.d directory to make udev-test.pl work. [YOCTO #5664] [YOCTO #5673] [YOCTO #5674] (From OE-Core rev: 03ed9095b1ca54a060407f355be0ad9ec86b7610) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/run-ptest1
-rw-r--r--meta/recipes-core/systemd/systemd_208.bb12
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 @@
1tar -C test -xJf test/sys.tar.xz
1make test/rules-test.sh.log 2make test/rules-test.sh.log
2make test/udev-test.pl.log 3make 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 () {
120 install ${S}/test/* ${D}${PTEST_PATH}/test 120 install ${S}/test/* ${D}${PTEST_PATH}/test
121 install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ 121 install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/
122 install -d ${D}${PTEST_PATH}/build-aux 122 install -d ${D}${PTEST_PATH}/build-aux
123 cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
123 cp -rf ${B}/rules ${D}${PTEST_PATH}/ 124 cp -rf ${B}/rules ${D}${PTEST_PATH}/
125 # This directory needs to be there for udev-test.pl to work.
126 install -d ${D}${libdir}/udev/rules.d
124 cp ${B}/Makefile ${D}${PTEST_PATH}/ 127 cp ${B}/Makefile ${D}${PTEST_PATH}/
125 cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ 128 cp ${S}/test/sys.tar.xz ${D}${PTEST_PATH}/test
126 tar -C ${D}${PTEST_PATH}/test -xJf ${S}/test/sys.tar.xz
127 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl 129 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
130 sed -i 's#${S}#${PTEST_PATH}#g' ${D}${PTEST_PATH}/Makefile
131 sed -i 's#${B}#${PTEST_PATH}#g' ${D}${PTEST_PATH}/Makefile
128} 132}
129 133
130python populate_packages_prepend (){ 134python populate_packages_prepend (){
@@ -147,6 +151,10 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
147FILES_${PN}-initramfs = "/init" 151FILES_${PN}-initramfs = "/init"
148RDEPENDS_${PN}-initramfs = "${PN}" 152RDEPENDS_${PN}-initramfs = "${PN}"
149 153
154# The test cases need perl and bash to run correctly.
155RDEPENDS_${PN}-ptest += "perl bash"
156FILES_${PN}-ptest += "${libdir}/udev/rules.d"
157
150FILES_${PN}-gui = "${bindir}/systemadm" 158FILES_${PN}-gui = "${bindir}/systemadm"
151 159
152FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ 160FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \