From 58f89bc14db0475c52abff7376111269cc892af8 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 4 Sep 2003 15:07:59 +1000 Subject: [PATCH] - [regress/agent-ptrace.sh regress/agent-timeout.sh] "grep -q" -> "grep >/dev/null" --- ChangeLog | 4 +++- regress/agent-ptrace.sh | 2 +- regress/agent-timeout.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef124628b..0e11f53d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh regress/transfer.sh] Use ${EXEEXT} where appropriate. - [regress/sftp.sh] Remove dependency on /dev/stdin. + - [regress/agent-ptrace.sh regress/agent-timeout.sh] + "grep -q" -> "grep >/dev/null" 20030903 - (djm) OpenBSD CVS Sync @@ -1005,4 +1007,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2950 2003/09/04 05:00:55 dtucker Exp $ +$Id: ChangeLog,v 1.2951 2003/09/04 05:07:59 dtucker Exp $ diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh index 7367d7aff..b9570ef48 100644 --- a/regress/agent-ptrace.sh +++ b/regress/agent-ptrace.sh @@ -30,7 +30,7 @@ EOF if [ $? -ne 0 ]; then fail "gdb failed: exit code $?" fi - grep -q 'ptrace: Operation not permitted.' ${OBJ}/gdb.out + grep 'ptrace: Operation not permitted.' >/dev/null ${OBJ}/gdb.out r=$? rm -f ${OBJ}/gdb.out if [ $r -ne 0 ]; then diff --git a/regress/agent-timeout.sh b/regress/agent-timeout.sh index 28b1be028..01d6580ab 100644 --- a/regress/agent-timeout.sh +++ b/regress/agent-timeout.sh @@ -26,7 +26,7 @@ else trace "sleeping 2*${TIMEOUT} seconds" sleep ${TIMEOUT} sleep ${TIMEOUT} - ${SSHADD} -l 2> /dev/null | grep -q 'The agent has no identities.' + ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null if [ $? -ne 0 ]; then fail "ssh-add -l still returns keys after timeout" fi