[PATCH 0/2] Openssh test fixes

[PATCH 0/2] Openssh test fixes

[Jussi Kukkonen]

The following changes since commit 7d5d8d0cd985edf507c8d00e2e162d1b9fff3589:

  scripts/lib/bsp/engine: trailing whitespace cleanup (2016-02-08 10:54:56 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/openssh-tests
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/openssh-tests

Jussi Kukkonen (2):
  openssh: Fix regex that sets sftp-server path for tests
  openssh: Properly skip ptrace test if tools are missing

 meta/recipes-connectivity/openssh/openssh/run-ptest | 6 +++---
 meta/recipes-connectivity/openssh/openssh_7.1p2.bb  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.1.4

[PATCH 1/2] openssh: Fix regex that sets sftp-server path for tests

[Jussi Kukkonen]

[YOCTO #9049]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index 9c62d78..3b5e28a 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
@@ -125,7 +125,7 @@ do_install_append () {
 }
 
 do_install_ptest () {
-	sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libdir}/${PN}/sftp-server|" regress/test-exec.sh
+	sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh
 	cp -r regress ${D}${PTEST_PATH}
 }
 
-- 
2.1.4

[PATCH 2/2] openssh: Properly skip ptrace test if tools are missing

[Jussi Kukkonen]

Without the exit there will be a SKIP and a FAIL for the same test.
Also fix typo in a message.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-connectivity/openssh/openssh/run-ptest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest
index 769162e..36a3d2a 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
@@ -7,12 +7,12 @@ sed -i "/\t\tagent-ptrace /d" Makefile
 make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
         | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
 
-
 SSHAGENT=`which ssh-agent`
 GDB=`which gdb`
 
 if [ -z "${SSHAGENT}" -o -z "${GDB}" ]; then
        echo "SKIP: agent-ptrace"
+       exit
 fi
 
 useradd openssh-test
@@ -33,9 +33,9 @@ EOF
 	r=$?
 	rm -f /tmp/gdb.out
 	if [ $r -ne 0 ]; then
-		echo "FAIL: ptrace agant"
+		echo "FAIL: ptrace agent"
 	else
-		echo "PASS: ptrace agant"
+		echo "PASS: ptrace agent"
 	fi
 
 	${SSHAGENT} -k > /dev/null
-- 
2.1.4