openssh: capture ptest regression test failure logs

When tests fail, capture the sshd and ssh client logs from
the failing test run. These are needed to investigate
the root cause.

Reference: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15178

(From OE-Core rev: 7c6a0ee7961dc976dddbfd1615f90c2306970626)

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mikko Rapeli
2023-09-06 17:29:09 +03:00
committed by Richard Purdie
parent de3f6ad173
commit eab2b3f6b6
2 changed files with 35 additions and 0 deletions

View File

@@ -0,0 +1,34 @@
From 554f7baed050f89ffc2a7192d3071e8c5420f6d3 Mon Sep 17 00:00:00 2001
From: Mikko Rapeli <mikko.rapeli@linaro.org>
Date: Fri, 25 Aug 2023 10:35:28 +0000
Subject: [PATCH] openssh regress/Makefile: print logs if test fails
Some tests are failing in CI runs and reproduction has failed. Print
the captured sshd and ssh client logs if test fails. This should
help to fix the root causes.
Reference: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15178
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
regress/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Upstream-Status: Submitted [https://github.com/openssh/openssh-portable/pull/437]
diff --git a/regress/Makefile b/regress/Makefile
index d80bf59..a972dff 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -229,7 +229,7 @@ t-exec: ${LTESTS:=.sh}
done; \
if [ "x$${skip}" = "xno" ]; then \
echo "run test $${TEST}" ... 1>&2; \
- (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+ (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || (echo return value: $$?; echo capturing logs; cat *.log; exit 1); \
else \
echo skip test $${TEST} 1>&2; \
fi; \
--
2.34.1

View File

@@ -24,6 +24,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
file://sshd_check_keys \
file://add-test-support-for-busybox.patch \
file://0001-openssh-regress-Makefile-print-logs-if-test-fails.patch \
"
SRC_URI[sha256sum] = "3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85"