diff options
author | Mikko Rapeli <mikko.rapeli@linaro.org> | 2023-09-14 13:36:43 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-14 21:57:16 +0100 |
commit | aee5f979ed77c12b225ad8618e16ad0dc83fee3c (patch) | |
tree | e5ddf4dfb1832b60f5a23486622fb328475c9d83 /meta/recipes-connectivity/openssh/openssh/run-ptest | |
parent | fd72958ca003046bbe10d8f50c7f3830311be520 (diff) | |
download | poky-aee5f979ed77c12b225ad8618e16ad0dc83fee3c.tar.gz |
openssh: capture logs in run-ptest
Drop patch to improve logging since upstream rejected it
but capture failure logs in run-ptests with similar code
as what upstream uses when running the tests via
https://github.com/openssh/openssh-portable/blob/master/.github/run_test.sh#L23
(From OE-Core rev: 5f817f5a3897bca39eb832bb910b032632f275b8)
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/run-ptest')
-rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest index 8a9b770d59..1e6eec5799 100755 --- a/meta/recipes-connectivity/openssh/openssh/run-ptest +++ b/meta/recipes-connectivity/openssh/openssh/run-ptest | |||
@@ -4,6 +4,20 @@ export TEST_SHELL=sh | |||
4 | export SKIP_UNIT=1 | 4 | export SKIP_UNIT=1 |
5 | 5 | ||
6 | cd regress | 6 | cd regress |
7 | |||
8 | # copied from openssh-portable/.github/run_test.sh | ||
9 | output_failed_logs() { | ||
10 | for i in failed*.log; do | ||
11 | if [ -f "$i" ]; then | ||
12 | echo ------------------------------------------------------------------------- | ||
13 | echo LOGFILE $i | ||
14 | cat $i | ||
15 | echo ------------------------------------------------------------------------- | ||
16 | fi | ||
17 | done | ||
18 | } | ||
19 | trap output_failed_logs 0 | ||
20 | |||
7 | sed -i "/\t\tagent-ptrace /d" Makefile | 21 | sed -i "/\t\tagent-ptrace /d" Makefile |
8 | make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ | 22 | make -k BUILDDIR=`pwd`/.. .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ |
9 | | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' | 23 | | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' |