git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/blob

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