summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-04 15:07:59 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-04 15:07:59 +1000
commit58f89bc14db0475c52abff7376111269cc892af8 (patch)
tree39ab5de335a717ecf0272a48aa722306ef5f6eaf
parente15b0dd011b42612e699441a31ca88b9dc6b3f20 (diff)
- [regress/agent-ptrace.sh regress/agent-timeout.sh]
"grep -q" -> "grep >/dev/null"
-rw-r--r--ChangeLog4
-rw-r--r--regress/agent-ptrace.sh2
-rw-r--r--regress/agent-timeout.sh2
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 @@
15 regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh 15 regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
16 regress/transfer.sh] Use ${EXEEXT} where appropriate. 16 regress/transfer.sh] Use ${EXEEXT} where appropriate.
17 - [regress/sftp.sh] Remove dependency on /dev/stdin. 17 - [regress/sftp.sh] Remove dependency on /dev/stdin.
18 - [regress/agent-ptrace.sh regress/agent-timeout.sh]
19 "grep -q" -> "grep >/dev/null"
18 20
1920030903 2120030903
20 - (djm) OpenBSD CVS Sync 22 - (djm) OpenBSD CVS Sync
@@ -1005,4 +1007,4 @@
1005 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1007 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1006 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1008 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1007 1009
1008$Id: ChangeLog,v 1.2950 2003/09/04 05:00:55 dtucker Exp $ 1010$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
30 if [ $? -ne 0 ]; then 30 if [ $? -ne 0 ]; then
31 fail "gdb failed: exit code $?" 31 fail "gdb failed: exit code $?"
32 fi 32 fi
33 grep -q 'ptrace: Operation not permitted.' ${OBJ}/gdb.out 33 grep 'ptrace: Operation not permitted.' >/dev/null ${OBJ}/gdb.out
34 r=$? 34 r=$?
35 rm -f ${OBJ}/gdb.out 35 rm -f ${OBJ}/gdb.out
36 if [ $r -ne 0 ]; then 36 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
26 trace "sleeping 2*${TIMEOUT} seconds" 26 trace "sleeping 2*${TIMEOUT} seconds"
27 sleep ${TIMEOUT} 27 sleep ${TIMEOUT}
28 sleep ${TIMEOUT} 28 sleep ${TIMEOUT}
29 ${SSHADD} -l 2> /dev/null | grep -q 'The agent has no identities.' 29 ${SSHADD} -l 2> /dev/null | grep 'The agent has no identities.' >/dev/null
30 if [ $? -ne 0 ]; then 30 if [ $? -ne 0 ]; then
31 fail "ssh-add -l still returns keys after timeout" 31 fail "ssh-add -l still returns keys after timeout"
32 fi 32 fi