summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2016-03-04 02:48:07 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2016-03-04 02:48:07 +0000
commitd0e4292bb7c00db50586d5cdbed4c0837e26b6c4 (patch)
tree64581d6d3915622e41cf92509484ea3722c549eb /regress/usr.bin
parent739d16a2b14e5000570fc3717460c66c512a7737 (diff)
Filter debug messages out of log before picking the last two lines.
Should prevent problems if any more debug output is added late in the connection.
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/ssh/integrity.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/integrity.sh b/regress/usr.bin/ssh/integrity.sh
index 36090999afb..98dba772f17 100644
--- a/regress/usr.bin/ssh/integrity.sh
+++ b/regress/usr.bin/ssh/integrity.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: integrity.sh,v 1.17 2016/03/03 00:46:53 dtucker Exp $
+# $OpenBSD: integrity.sh,v 1.18 2016/03/04 02:48:06 dtucker Exp $
# Placed in the Public Domain.
tid="integrity"
@@ -48,7 +48,7 @@ for m in $macs; do
fail "ssh -m $m succeeds with bit-flip at $off"
fi
ecnt=$((ecnt+1))
- out=$(tail -3 $TEST_SSH_LOGFILE | egrep -v "^debug" | \
+ out=$(egrep -v "^debug" $TEST_SSH_LOGFILE | tail -2 | \
tr -s '\r\n' '.')
case "$out" in
Bad?packet*) elen=$((elen+1)); skip=2;;