[OE-core] [PATCH 2/2] openssh: Properly skip ptrace test if tools are missing
Jussi Kukkonen
jussi.kukkonen at intel.com
Tue Feb 9 15:27:29 UTC 2016
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 at 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
More information about the Openembedded-core
mailing list