]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssh: Properly skip ptrace test if tools are missing
authorJussi Kukkonen <jussi.kukkonen@intel.com>
Tue, 9 Feb 2016 15:27:29 +0000 (17:27 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Feb 2016 12:27:27 +0000 (12:27 +0000)
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>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-connectivity/openssh/openssh/run-ptest

index 769162e0c829f1a456692c1a9dd204df11cb8cdb..36a3d2a7b7bdb3c3555f9330341f8e06337afc09 100755 (executable)
@@ -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