summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2015-03-16 22:49:20 -0700
committerTim Rice <tim@multitalents.net>2015-03-16 22:49:20 -0700
commit9f82e5a9042f2d872e98f48a876fcab3e25dd9bb (patch)
treeb52f2a2d163fdbec8e19dd4e5da4d56eed7af78c
parent8ef691f7d9ef500257a549d0906d78187490668f (diff)
portability fix: Solaris systems may not have a grep that understands -qV_6_8_P1
-rw-r--r--regress/Makefile2
-rw-r--r--regress/test-exec.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 1eef340a..99a7d60f 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -184,7 +184,7 @@ t12.out:
${TEST_SSH_SSHKEYGEN} -q -t ed25519 -N '' -C 'test-comment-1234' -f $(OBJ)/$@
t12: t12.out
- ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t12.out.pub | grep -q test-comment-1234
+ ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t12.out.pub | grep test-comment-1234 >/dev/null
t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 12ba094a..0f766620 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -381,7 +381,7 @@ fatal ()
ssh_version ()
{
- echo ${SSH_PROTOCOLS} | grep -q "$1"
+ echo ${SSH_PROTOCOLS} | grep "$1" >/dev/null
}
RESULT=0