1From f5a4dacc987ca548fc86577c2dba121c86da3c34 Mon Sep 17 00:00:00 2001 2From: Mikko Rapeli <mikko.rapeli@linaro.org> 3Date: Mon, 11 Sep 2023 09:55:21 +0100 4Subject: [PATCH] regress/banner.sh: log input and output files on error 5 6Some test environments like yocto with qemu are seeing these 7tests failing. There may be additional error messages in the 8stderr of ssh cloent command. busybox cmp shows this error when 9first input file has less new line characters then second 10input file: 11 12cmp: EOF on /usr/lib/openssh/ptest/regress/banner.in 13 14Logging the full banner.out will show what other error messages 15are captured in addition of the expected banner. 16 17Full log of a failing banner test runs is: 18 19run test banner.sh ... 20test banner: missing banner file 21test banner: size 0 22cmp: EOF on /usr/lib/openssh/ptest/regress/banner.in 23banner size 0 mismatch 24test banner: size 10 25test banner: size 100 26cmp: EOF on /usr/lib/openssh/ptest/regress/banner.in 27banner size 100 mismatch 28test banner: size 1000 29test banner: size 10000 30test banner: size 100000 31test banner: suppress banner (-q) 32FAIL: banner 33return value: 1 34 35See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15178 36 37Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> 38--- 39 regress/banner.sh | 4 +++- 40 1 file changed, 3 insertions(+), 1 deletion(-) 41 42Upstream-Status: Denied [https://github.com/openssh/openssh-portable/pull/437] 43 44diff --git a/regress/banner.sh b/regress/banner.sh 45index a84feb5a..de84957a 100644 46--- a/regress/banner.sh 47+++ b/regress/banner.sh 48@@ -32,7 +32,9 @@ for s in 0 10 100 1000 10000 100000 ; do 49 verbose "test $tid: size $s" 50 ( ${SSH} -F $OBJ/ssh_proxy otherhost true 2>$OBJ/banner.out && \ 51 cmp $OBJ/banner.in $OBJ/banner.out ) || \ 52- fail "banner size $s mismatch" 53+ ( verbose "Contents of $OBJ/banner.in:"; cat $OBJ/banner.in; \ 54+ verbose "Contents of $OBJ/banner.out:"; cat $OBJ/banner.out; \ 55+ fail "banner size $s mismatch" ) 56 done 57 58 trace "test suppress banner (-q)" 59-- 602.34.1 61 62