[PATCH] openssh: skip unit tests to avoid Makefile errors

* [PATCH] openssh: skip unit tests to avoid Makefile errors
@ 2020-01-20 16:08 Mingde (Matthew) Zeng
  2020-01-20 16:12 ` Alexander Kanavin
  0 siblings, 1 reply; 3+ messages in thread
From: Mingde (Matthew) Zeng @ 2020-01-20 16:08 UTC (permalink / raw)
  To: openembedded-core


As per do_compile_ptest first appeared in commit 1f7aaf76f4aa7875f05f4b838a5ec4594a4c35dc,
regress/unittests/ binaries are already skipped.

This will trigger a Makefile error when running ptest:
```sh
/bin/sh: line 4: /usr/lib/openssh/ptest/regress/unittests/sshbuf/test_sshbuf: No such file or directory
make: *** [Makefile:243: unit] Error 127
make: Target 'tests' not remade because of errors.
```

openssh/regress/Makefile:
```
tests:		prep file-tests t-exec unit
```

Therefore we do not `make tests` as it consists of unit tests, we
`make prep file-tests t-exec` instead.

Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com>

---
 meta/recipes-connectivity/openssh/openssh/run-ptest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest
index daf62cca5b..e5270ceade 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
@@ -4,7 +4,8 @@ export TEST_SHELL=sh

 cd regress
 sed -i "/\t\tagent-ptrace /d" Makefile
-make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
+
+make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" prep file-tests t-exec \
         | sed -u -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'

 SSHAGENT=`which ssh-agent`
@@ -41,4 +42,3 @@ EOF
 	${SSHAGENT} -k > /dev/null
 fi
 userdel openssh-test
-
--
2.24.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread