Simplify run-ptest and do_install_ptest by removing conditional checks. If upstream renames or relocates test files, the build should fail explicitly rather than silently skipping tests, ensuring the recipe is updated appropriately.
Changes: - Use testcases/* glob to automatically discover all test suites - Remove file existence checks from run-ptest - Remove file existence checks from do_install_ptest Signed-off-by: Pratik Farkase <[email protected]> --- .../libsolv/libsolv/run-ptest | 19 +++++-------------- .../libsolv/libsolv_0.7.35.bb | 15 +++------------ 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/meta/recipes-extended/libsolv/libsolv/run-ptest b/meta/recipes-extended/libsolv/libsolv/run-ptest index 1462aecd61..857b719ae5 100755 --- a/meta/recipes-extended/libsolv/libsolv/run-ptest +++ b/meta/recipes-extended/libsolv/libsolv/run-ptest @@ -2,20 +2,11 @@ cd test -for t in allowuninstall alternative blacklist choicerules choose cleandeps \ - cplxdeps distupgrade evrcmp excludefromweak favor focus forcebest \ - lock lockstep multiversion namespace proof recommendations sat \ - selection strictrepoprio strongrecommends targeted testcase weakdeps \ - whatprovideswithdisabled yumobs; do - - if [ -x ./runtestcases.sh ] && [ -d testcases/$t ]; then - ./runtestcases.sh ../tools/testsolv testcases/$t - if [ $? -eq 0 ]; then - echo "PASS: $t" - else - echo "FAIL: $t" - fi +for t in testcases/*; do + ./runtestcases.sh ../tools/testsolv $t + if [ $? -eq 0 ]; then + echo "PASS: $t" else - echo "SKIP: $t" + echo "FAIL: $t" fi done diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.35.bb b/meta/recipes-extended/libsolv/libsolv_0.7.35.bb index 53daa36106..ef348de904 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.35.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.35.bb @@ -38,18 +38,9 @@ do_compile_ptest() { do_install_ptest() { install -d ${D}${PTEST_PATH}/tools install -d ${D}${PTEST_PATH}/test - - if [ -f ${B}/tools/testsolv ]; then - install -m 0755 ${B}/tools/testsolv ${D}${PTEST_PATH}/tools/ - fi - - if [ -f ${S}/test/runtestcases.sh ]; then - install -m 0755 ${S}/test/runtestcases.sh ${D}${PTEST_PATH}/test/ - fi - - if [ -d ${S}/test/testcases ]; then - cp -r ${S}/test/testcases ${D}${PTEST_PATH}/test/ - fi + install -m 0755 ${B}/tools/testsolv ${D}${PTEST_PATH}/tools/ + install -m 0755 ${S}/test/runtestcases.sh ${D}${PTEST_PATH}/test/ + cp -r ${S}/test/testcases ${D}${PTEST_PATH}/test/ } RDEPENDS:${PN}-ptest += "bash" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230995): https://lists.openembedded.org/g/openembedded-core/message/230995 Mute This Topic: https://lists.openembedded.org/mt/117759403/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
