diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2014-05-21 07:04:22 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2014-05-21 07:04:22 +0000 |
| commit | b2d05937dc8f5504bcf8cb9294829279c79dfe05 (patch) | |
| tree | 5c940e28db4e70b7bf4c9562c3939370e16de316 /regress | |
| parent | 58d6b0c0f6c4bb2a9fe1e5ec494c8124c7083c27 (diff) | |
when failing because of unexpected output, show the offending output
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/integrity.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/integrity.sh b/regress/usr.bin/ssh/integrity.sh index 2625edc64d6..fdfe76fd25b 100644 --- a/regress/usr.bin/ssh/integrity.sh +++ b/regress/usr.bin/ssh/integrity.sh @@ -1,4 +1,4 @@ -# $OpenBSD: integrity.sh,v 1.13 2014/04/21 22:15:37 djm Exp $ +# $OpenBSD: integrity.sh,v 1.14 2014/05/21 07:04:21 djm Exp $ # Placed in the Public Domain. tid="integrity" @@ -48,14 +48,14 @@ for m in $macs; do fail "ssh -m $m succeeds with bit-flip at $off" fi ecnt=$((ecnt+1)) - output=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ + out=$(tail -2 $TEST_SSH_LOGFILE | egrep -v "^debug" | \ tr -s '\r\n' '.') - case "$output" in + case "$out" in Bad?packet*) elen=$((elen+1)); skip=2;; Corrupted?MAC* | Decryption?integrity?check?failed*) emac=$((emac+1)); skip=0;; padding*) epad=$((epad+1)); skip=0;; - *) fail "unexpected error mac $m at $off";; + *) fail "unexpected error mac $m at $off: $out";; esac done verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen" |