[openssh-commits] [openssh] 01/01: portability fix: Solaris systems may not have a grep that understands -q

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

tim pushed a commit to branch master
in repository openssh.

commit 9f82e5a9042f2d872e98f48a876fcab3e25dd9bb
Author: Tim Rice <tim at multitalents.net>
Date:   Mon Mar 16 22:49:20 2015 -0700

    portability fix: Solaris systems may not have a grep that understands -q
---
 regress/Makefile     | 2 +-
 regress/test-exec.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/regress/Makefile b/regress/Makefile
index 1eef340..99a7d60 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 12ba094..0f76662 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.