diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-09-14 00:45:31 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-14 11:34:59 +1000 |
| commit | 2b939c272a81c4d0c47badeedbcb2ba7c128ccda (patch) | |
| tree | 15013f57ad0018923d595dd1e2491273789e836a | |
| parent | 44d82fc83be6c5ccd70881c2dac1a73e5050398b (diff) | |
upstream commit
Improve test coverage of ssh-keygen -T a bit.
Upstream-Regress-ID: 8851668c721bcc2b400600cfc5a87644cc024e72
| -rw-r--r-- | regress/keygen-moduli.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/regress/keygen-moduli.sh b/regress/keygen-moduli.sh index 4be7b4d6..d4e77138 100644 --- a/regress/keygen-moduli.sh +++ b/regress/keygen-moduli.sh @@ -1,13 +1,16 @@ -# $OpenBSD: keygen-moduli.sh,v 1.1 2016/09/12 02:25:46 dtucker Exp $ +# $OpenBSD: keygen-moduli.sh,v 1.2 2016/09/14 00:45:31 dtucker Exp $ # Placed in the Public Domain. tid="keygen moduli" -for i in 0 1 2; do +# Try "start at the beginning and stop after 1", "skip 1 then stop after 1" +# and "skip 2 and run to the end with checkpointing". Since our test data +# file has 3 lines, these should always result in 1 line of output. +for i in "-J1" "-j1 -J1" "-j2 -K $OBJ/moduli.ckpt"; do + trace "keygen $i" rm -f $OBJ/moduli.out $OBJ/moduli.ckpt - ${SSHKEYGEN} -T $OBJ/moduli.out -f ${SRC}/moduli.in -j$i -J1 \ - -K $OBJ/moduli.ckpt 2>/dev/null || \ - fail "keygen screen failed line $i" + ${SSHKEYGEN} -T $OBJ/moduli.out -f ${SRC}/moduli.in $i 2>/dev/null || \ + fail "keygen screen failed $i" lines=`wc -l <$OBJ/moduli.out` test "$lines" -eq "1" || fail "expected 1 line, got $lines" done |