From 1ec13d7d9516039db6374f38f39b57f67905ee6b Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Fri, 10 Apr 2020 20:10:10 -0400 Subject: [PATCH] rsyslog: 8.1911.0 -> 8.2002.0 Add some error handling to run-ptests. Fix up the new set-envvars script to that 36 new tests pass. On qemux86-64/kvm the ptest results with extra filesystem space and a timeout of 800 seconds are: 1911 2002 TOTAL: 389 408 PASS: 339 357 SKIP: 39 39 XFAIL: 0 0 FAIL: 11 12 XPASS: 0 0 ERROR: 0 0 Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest | 5 +++++ .../rsyslog/{rsyslog_8.1911.0.bb => rsyslog_8.2002.0.bb} | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.1911.0.bb => rsyslog_8.2002.0.bb} (96%) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest index 3770a75065..aa698d85ce 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest @@ -1,3 +1,8 @@ #!/bin/sh # +set -e +set -o pipefail + +SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" +cd ${SCRIPTPATH} make -C tests -k check-TESTS diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb similarity index 96% rename from meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb rename to meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb index f82caf7b5c..6a90614bfd 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.1911.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2002.0.bb @@ -29,8 +29,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "154e33feb587216f2955050a8301104c" -SRC_URI[sha256sum] = "e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104" +SRC_URI[md5sum] = "fbe6d18205170e22bad470954d0dc874" +SRC_URI[sha256sum] = "fe86c14d860da1202c76616feac0539ea5a40a4ad182d74b7d6d2419cc2381f8" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" @@ -131,6 +131,8 @@ do_install_ptest() { # fix the module load path with runtime/.libs find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \ sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g' + # fix the python3 path for tests/set-envar + sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/tests/set-envvars } do_install_append() {