[OE-core] [PATCH 8/8] openssh: fix some ptest exec issues

Armin Kuster akuster808 at gmail.com
Sat May 19 02:13:54 UTC 2018


From: Armin Kuster <akuster808 at gmail.com>

SUDO needs to be empty to run some of the tests on the target.
compile check-perm which is needed for some tests.
skip "unit" tests in regress/Makefile

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-connectivity/openssh/openssh/run-ptest | 2 +-
 meta/recipes-connectivity/openssh/openssh_7.7p1.bb  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest
index 36a3d2a..39fb521 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
@@ -4,7 +4,7 @@ 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="" tests \
         | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
 
 SSHAGENT=`which ssh-agent`
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index 691dec6..40e0fb0 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
@@ -84,7 +84,7 @@ do_configure_prepend () {
 do_compile_ptest() {
         # skip regress/unittests/ binaries: this will silently skip
         # unittests in run-ptests which is good because they are so slow.
-        oe_runmake regress/modpipe regress/setuid-allowed regress/netcat
+        oe_runmake regress/modpipe regress/setuid-allowed regress/netcat regress/check-perm
 }
 
 do_install_append () {
@@ -132,6 +132,7 @@ do_install_append () {
 
 do_install_ptest () {
 	sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh
+	sed -i -e "s|EGRESS_TARGETS=./*unit|EGRESS_TARGETS=|" regress/Makefile
 	cp -r regress ${D}${PTEST_PATH}
 }
 
-- 
2.7.4




More information about the Openembedded-core mailing list