From e65a29e3119030775e37bcc23374285d30a61245 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 9 Feb 2016 17:27:29 +0200 Subject: openssh: Properly skip ptrace test if tools are missing Without the exit there will be a SKIP and a FAIL for the same test. Also fix typo in a message. (From OE-Core rev: d44a2ec730fe52d2266c5e4d184cd4c881e172d1) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh/run-ptest | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest b/meta/recipes-connectivity/openssh/openssh/run-ptest index 769162e0c8..36a3d2a7b7 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 -- cgit 1.2.3-korg