diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-03-04 02:48:06 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-03-04 15:12:25 +1100 |
| commit | 331b8e07ee5bcbdca12c11cc8f51a7e8de09b248 (patch) | |
| tree | 418edce00b30924a96b012fb96244674e8fd8e47 | |
| parent | 0892edaa3ce623381d3a7635544cbc69b31cf9cb (diff) | |
upstream commit
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.
Upstream-Regress-ID: 345d0a9589c381e7d640a4ead06cfaadf4db1363
| -rw-r--r-- | regress/integrity.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/integrity.sh b/regress/integrity.sh index 6acbe4fc0..bfadc6b48 100644 --- a/regress/integrity.sh +++ b/regress/integrity.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: integrity.sh,v 1.17 2016/03/03 00:46:53 dtucker Exp $ | 1 | # $OpenBSD: integrity.sh,v 1.18 2016/03/04 02:48:06 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="integrity" | 4 | tid="integrity" |
| @@ -54,7 +54,7 @@ for m in $macs; do | |||
| 54 | fail "ssh -m $m succeeds with bit-flip at $off" | 54 | fail "ssh -m $m succeeds with bit-flip at $off" |
| 55 | fi | 55 | fi |
| 56 | ecnt=`expr $ecnt + 1` | 56 | ecnt=`expr $ecnt + 1` |
| 57 | out=$(tail -3 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ | 57 | out=$(egrep -v "^debug" $TEST_SSH_LOGFILE | tail -2 | \ |
| 58 | tr -s '\r\n' '.') | 58 | tr -s '\r\n' '.') |
| 59 | case "$out" in | 59 | case "$out" in |
| 60 | Bad?packet*) elen=`expr $elen + 1`; skip=3;; | 60 | Bad?packet*) elen=`expr $elen + 1`; skip=3;; |