diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-02-09 17:27:29 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-11 12:27:27 +0000 |
| commit | d44a2ec730fe52d2266c5e4d184cd4c881e172d1 (patch) | |
| tree | cf5b8a203a9b60639985e119d62dea2bbe56d650 /meta/recipes-connectivity | |
| parent | b4dc73b6d6d082cd9e907998ff61dc3da7df2018 (diff) | |
| download | openembedded-core-d44a2ec730fe52d2266c5e4d184cd4c881e172d1.tar.gz openembedded-core-d44a2ec730fe52d2266c5e4d184cd4c881e172d1.tar.bz2 openembedded-core-d44a2ec730fe52d2266c5e4d184cd4c881e172d1.zip | |
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.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -rwxr-xr-x | meta/recipes-connectivity/openssh/openssh/run-ptest | 6 |
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 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 |