diff options
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 13 | ||||
| -rwxr-xr-x | meta/recipes-devtools/quilt/quilt/run-ptest | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index f7ff958103..01fc22e996 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -61,6 +61,9 @@ do_install:append:class-native () { touch ${D}${sysconfdir}/quiltrc } +# The tests need to run as a non-root user, so pull in the ptest user +DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" + do_install_ptest() { install ${WORKDIR}/test.sh ${D}${PTEST_PATH} mkdir ${D}${PTEST_PATH}/test @@ -69,6 +72,14 @@ do_install_ptest() { rm -f ${D}${PTEST_PATH}/test/mail.test ${D}${PTEST_PATH}/test/patch-wrapper.test } +# ptest.bbclass currently chowns the ptest directory explicitly, so we need to +# change permission after that has happened so the ptest user can write a +# temporary directory. +do_install_ptest_base:append() { + chgrp ptest ${D}${PTEST_PATH}/test + chmod g+w ${D}${PTEST_PATH}/test +} + PACKAGES += "guards guards-doc" FILES:${PN} = "${sysconfdir} ${datadir}/quilt \ @@ -84,5 +95,5 @@ RDEPENDS:${PN}-ptest += "file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ perl-module-text-parsewords perl-module-overloading \ - bash util-linux-getopt \ + bash util-linux-getopt ptest-runner \ " diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/meta/recipes-devtools/quilt/quilt/run-ptest index 322508cbe2..f35a756d6b 100755 --- a/meta/recipes-devtools/quilt/quilt/run-ptest +++ b/meta/recipes-devtools/quilt/quilt/run-ptest @@ -1,7 +1,3 @@ #!/bin/sh -/usr/sbin/adduser --disabled-password --gecos "" quilttest - -su -c ./test.sh quilttest - -/usr/sbin/deluser quilttest +su -c ./test.sh ptest |