cpio: Run ptests under ptest user
PATCH 1/1 cpio: Run ptests under ptest user
Running these tests under root user on musl works ok but it emits additional diagnostic
cpio: dir: Cannot change ownership to uid 0, gid 0: Not supported
Ideally its better to run this test suite under non-root user which is often how these are run. Moreover, tests work on musl as well.
---
meta/recipes-extended/cpio/cpio-2.13/run-ptest | 9 +--------
.../cpio/cpio-2.13/{run-ptest => test.sh} | 0
meta/recipes-extended/cpio/cpio_2.13.bb | 16 ++++++++++++++++
3 files changed, 17 insertions(+), 8 deletions(-)
mode change 100644 => 100755 meta/recipes-extended/cpio/cpio-2.13/run-ptest
copy meta/recipes-extended/cpio/cpio-2.13/{run-ptest => test.sh} (100%)meta/recipes-extended/cpio/cpio-2.13/run-ptest +1 -8
@@ -1,10 +1,3 @@ #!/bin/sh -# Define cpio test work dir -WORKDIR=@PTEST_PATH@/tests/ - -# Run test -cd ${WORKDIR} -./atconfig ./atlocal ./testsuite - -./testsuite 2>&1 | grep -E '[0-9]{1,3}: ' | sed -e 's/^.....//' -e '/[ok]$/s/^/PASS: /;/FAILED (.*)/s/^/FAIL: /;/skipped (.*)/s/^/SKIP: /;/expected failure/ s/^/PASS: /;/UNEXPECTED PASS/s/^/FAIL: /' -e 's/ok$//g' -e 's/FAILED.*//g' -e 's/skipped.*//g' -e 's/expected failure.*//g' -e 's/UNEXPECTED PASS.*//g' +su -c ./test.sh ptest
meta/recipes-extended/cpio/cpio-2.13/test.sh renamed from meta/recipes-extended/cpio/cpio-2.13/run-ptest +0 -0
meta/recipes-extended/cpio/cpio_2.13.bb +16 -0
@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Use-__alignof__-with-clang.patch \ file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \ file://run-ptest \ + file://test.sh \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810"
@@ -57,9 +58,24 @@ do_install_ptest() { install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ + install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest } +# 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 -R ptest ${D}${PTEST_PATH}/ + chmod -R g+w ${D}${PTEST_PATH}/ +} + +# 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)}" +PACKAGE_WRITE_DEPS += "ptest-runner" + +RDEPENDS:${PN}-ptest += "ptest-runner" + PACKAGES =+ "${PN}-rmt" FILES:${PN}-rmt = "${sbindir}/rmt*"
Signature · 1 line
2.40.1
Quoted 66 lines · Khem Raj
Running these tests under root user on musl works ok but it emits additional diagnostic
cpio: dir: Cannot change ownership to uid 0, gid 0: Not supported
Ideally its better to run this test suite under non-root user which is often how these are run. Moreover, tests work on musl as well.
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-extended/cpio/cpio-2.13/run-ptest | 9 +-------- .../cpio/cpio-2.13/{run-ptest => test.sh} | 0 meta/recipes-extended/cpio/cpio_2.13.bb | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) mode change 100644 => 100755 meta/recipes-extended/cpio/cpio-2.13/run-ptest copy meta/recipes-extended/cpio/cpio-2.13/{run-ptest => test.sh} (100%)meta/recipes-extended/cpio/cpio-2.13/run-ptest +1
-8@@ -1,10 +1,3 @@ #!/bin/sh -# Define cpio test work dir -WORKDIR=@PTEST_PATH@/tests/ - -# Run test -cd ${WORKDIR} -./atconfig ./atlocal ./testsuite - -./testsuite 2>&1 | grep -E '[0-9]{1,3}: ' | sed -e 's/^.....//' -e '/[ok]$/s/^/PASS: /;/FAILED (.*)/s/^/FAIL: /;/skipped (.*)/s/^/SKIP: /;/expected failure/ s/^/PASS: /;/UNEXPECTED PASS/s/^/FAIL: /' -e 's/ok$//g' -e 's/FAILED.*//g' -e 's/skipped.*//g' -e 's/expected failure.*//g' -e 's/UNEXPECTED PASS.*//g' +su -c ./test.sh ptestmeta/recipes-extended/cpio/cpio-2.13/test.sh renamed from meta/recipes-extended/cpio/cpio-2.13/run-ptest +0
-0meta/recipes-extended/cpio/cpio_2.13.bb +9
-0@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Use-__alignof__-with-clang.patch \ file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \ file://run-ptest \ + file://test.sh \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810"@@ -57,9 +58,24 @@ do_install_ptest() { install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ + install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest } +# 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 -R ptest ${D}${PTEST_PATH}/ + chmod -R g+w ${D}${PTEST_PATH}/ +}
meta/recipes-extended/cpio/cpio_2.13.bb do_install_ptest() { · line 81
Quoted 10 lines
meta/recipes-extended/cpio/cpio_2.13.bb +7
-0+ +# 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)}" +PACKAGE_WRITE_DEPS += "ptest-runner" + +RDEPENDS:${PN}-ptest += "ptest-runner" + PACKAGES =+ "${PN}-rmt" FILES:${PN}-rmt = "${sbindir}/rmt*"
This seems to break the ptests as it stops returning results:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5010
Cheers,
Richard
Quoted 77 lines · Richard Purdie
Quoted 75 lines · Khem Raj
Running these tests under root user on musl works ok but it emits additional diagnostic
cpio: dir: Cannot change ownership to uid 0, gid 0: Not supported
Ideally its better to run this test suite under non-root user which is often how these are run. Moreover, tests work on musl as well.
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-extended/cpio/cpio-2.13/run-ptest | 9 +-------- .../cpio/cpio-2.13/{run-ptest => test.sh} | 0 meta/recipes-extended/cpio/cpio_2.13.bb | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) mode change 100644 => 100755 meta/recipes-extended/cpio/cpio-2.13/run-ptest copy meta/recipes-extended/cpio/cpio-2.13/{run-ptest => test.sh} (100%)meta/recipes-extended/cpio/cpio-2.13/run-ptest +1
-8@@ -1,10 +1,3 @@ #!/bin/sh -# Define cpio test work dir -WORKDIR=@PTEST_PATH@/tests/ - -# Run test -cd ${WORKDIR} -./atconfig ./atlocal ./testsuite - -./testsuite 2>&1 | grep -E '[0-9]{1,3}: ' | sed -e 's/^.....//' -e '/[ok]$/s/^/PASS: /;/FAILED (.*)/s/^/FAIL: /;/skipped (.*)/s/^/SKIP: /;/expected failure/ s/^/PASS: /;/UNEXPECTED PASS/s/^/FAIL: /' -e 's/ok$//g' -e 's/FAILED.*//g' -e 's/skipped.*//g' -e 's/expected failure.*//g' -e 's/UNEXPECTED PASS.*//g' +su -c ./test.sh ptestmeta/recipes-extended/cpio/cpio-2.13/test.sh renamed from meta/recipes-extended/cpio/cpio-2.13/run-ptest +0
-0meta/recipes-extended/cpio/cpio_2.13.bb +16
-0@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Use-__alignof__-with-clang.patch \ file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \ file://run-ptest \ + file://test.sh \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810"@@ -57,9 +58,24 @@ do_install_ptest() { install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ + install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest } +# 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 -R ptest ${D}${PTEST_PATH}/ + chmod -R g+w ${D}${PTEST_PATH}/ +} + +# 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)}" +PACKAGE_WRITE_DEPS += "ptest-runner" + +RDEPENDS:${PN}-ptest += "ptest-runner" + PACKAGES =+ "${PN}-rmt"
Quoted 5 lines
meta/recipes-extended/cpio/cpio_2.13.bb do_install_ptest() { · line 81
Quoted 1 line
meta/recipes-extended/cpio/cpio_2.13.bb +0
-0FILES:${PN}-rmt = "${sbindir}/rmt*"This seems to break the ptests as it stops returning results:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/5010
Good catch and my bad, I forgot to move PTEST_PATH substitution to test.sh, sent a v2 which should fix it
Quoted 5 lines
Cheers,
Richard