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

diff --git a/regress/integrity.sh b/regress/integrity.sh
index 6acbe4fc0fd6a4157229761e941e610bbf873ce8..bfadc6b488c4d95807d4579f56727c8e0078935f 100644 (file)
--- a/regress/integrity.sh
+++ b/regress/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"
@@ -54,7 +54,7 @@ for m in $macs; do
                        fail "ssh -m $m succeeds with bit-flip at $off"
                fi
                ecnt=`expr $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=`expr $elen + 1`; skip=3;;