From 559fd361440898479937c887a0e4f8cfb8c46891 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2020 14:27:59 +0100 Subject: libmodule-build-perl: fix ptests Particularly remove a broken detection of skipped tests (which was marking tests that actually passed), and install additional artefacts needed for testing. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit dbbce0918617c21d0e43e9727d38372c22dff3dc) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/libmodule-build-perl/run-ptest | 2 -- meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest b/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest index 0d63d1513b..d802781f9e 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest +++ b/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest @@ -6,8 +6,6 @@ for case in `find t -type f -name '*.t'`; do cat $case.output if [ $ret -ne 0 ]; then echo "FAIL: ${case%.t}" - elif grep -i 'SKIP' $case.output; then - echo "SKIP: ${case%.t}" else echo "PASS: ${case%.t}" fi diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb index f759f862fb..e3ba40d96c 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb @@ -36,7 +36,10 @@ do_patch[postfuncs] += "do_patch_module_build" do_install_ptest() { cp -r ${B}/inc ${D}${PTEST_PATH} cp -r ${B}/blib ${D}${PTEST_PATH} + cp -r ${B}/_build ${D}${PTEST_PATH} + cp -r ${B}/lib ${D}${PTEST_PATH} chown -R root:root ${D}${PTEST_PATH} + sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" ${D}${PTEST_PATH}/_build/build_params } RDEPENDS_${PN} += " \ -- cgit 1.2.3-korg