Message ID | 20230311002722.3211118-5-richard.purdie@linuxfoundation.org |
---|---|
State | Accepted, archived |
Commit | fbb9c596b8e6a8a1260dd7aefddf138d20bf64df |
Headers | show |
Series | [01/16] m4/opkg/ethtool/attr/libgpg-error: Add missing bash ptest dependency | expand |
diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest index 43128233654..3af75c84fea 100644 --- a/meta/recipes-support/attr/acl/run-ptest +++ b/meta/recipes-support/attr/acl/run-ptest @@ -7,4 +7,10 @@ mkdir -p /tmp/acl-ptest/test cp test/test.* /tmp/acl-ptest/test +set +e make test-suite.log +exitcode=$? +if [ $exitcode -ne 0 -a -e test-suite.log ]; then + cat test-suite.log +fi +exit $exitcode diff --git a/meta/recipes-support/attr/acl_2.3.1.bb b/meta/recipes-support/attr/acl_2.3.1.bb index 5fb8f9ae355..9cb19ed72f5 100644 --- a/meta/recipes-support/attr/acl_2.3.1.bb +++ b/meta/recipes-support/attr/acl_2.3.1.bb @@ -65,6 +65,7 @@ RDEPENDS:${PN}-ptest = "acl \ bash \ coreutils \ perl \ + perl-module-constant \ perl-module-filehandle \ perl-module-getopt-std \ perl-module-posix \ diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 53d9dccb27e..ab62563690b 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -51,6 +51,7 @@ do_install_ptest() { RDEPENDS:${PN}-ptest = "attr \ bash \ coreutils \ + perl-module-constant \ perl-module-filehandle \ perl-module-getopt-std \ perl-module-posix \ diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest index f64244f2393..3e7a3a17a04 100644 --- a/meta/recipes-support/attr/attr/run-ptest +++ b/meta/recipes-support/attr/attr/run-ptest @@ -1,3 +1,10 @@ #!/bin/sh +set +e make test-suite.log +exitcode=$? +if [ $exitcode -ne 0 -a -e test-suite.log ]; then + cat test-suite.log +fi +exit $exitcode +
Add a missing perl module dependency for the ptest packages and also improve the run-ptest script so that the error log is saved allowing easier debugging if this fails in future. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-support/attr/acl/run-ptest | 6 ++++++ meta/recipes-support/attr/acl_2.3.1.bb | 1 + meta/recipes-support/attr/attr.inc | 1 + meta/recipes-support/attr/attr/run-ptest | 7 +++++++ 4 files changed, 15 insertions(+)