summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-02-09 17:27:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:47 +0000
commite65a29e3119030775e37bcc23374285d30a61245 (patch)
tree0ace2055b97ecfc60a997840f647d108adf5d680 /meta/recipes-connectivity
parente1a1e0ba8decf339c5c5a56a29304103c1207aff (diff)
downloadpoky-e65a29e3119030775e37bcc23374285d30a61245.tar.gz
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 <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rwxr-xr-xmeta/recipes-connectivity/openssh/openssh/run-ptest6
1 files changed, 3 insertions, 3 deletions
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
7make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \ 7make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
8 | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g' 8 | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
9 9
10
11SSHAGENT=`which ssh-agent` 10SSHAGENT=`which ssh-agent`
12GDB=`which gdb` 11GDB=`which gdb`
13 12
14if [ -z "${SSHAGENT}" -o -z "${GDB}" ]; then 13if [ -z "${SSHAGENT}" -o -z "${GDB}" ]; then
15 echo "SKIP: agent-ptrace" 14 echo "SKIP: agent-ptrace"
15 exit
16fi 16fi
17 17
18useradd openssh-test 18useradd openssh-test
@@ -33,9 +33,9 @@ EOF
33 r=$? 33 r=$?
34 rm -f /tmp/gdb.out 34 rm -f /tmp/gdb.out
35 if [ $r -ne 0 ]; then 35 if [ $r -ne 0 ]; then
36 echo "FAIL: ptrace agant" 36 echo "FAIL: ptrace agent"
37 else 37 else
38 echo "PASS: ptrace agant" 38 echo "PASS: ptrace agent"
39 fi 39 fi
40 40
41 ${SSHAGENT} -k > /dev/null 41 ${SSHAGENT} -k > /dev/null