summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2016-09-14 00:45:32 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2016-09-14 00:45:32 +0000
commitbb00a0ad38d4a77c086bbd2695ada4b7a4979d99 (patch)
tree7403bfc32dcdfe5bf806eb711ccc9b3833e79548 /regress/usr.bin
parent8b56fc1c0cf90da1997693b3bc18a301d21e6ce3 (diff)
Improve test coverage of ssh-keygen -T a bit.
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/ssh/keygen-moduli.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/keygen-moduli.sh b/regress/usr.bin/ssh/keygen-moduli.sh
index 4be7b4d63d3..d4e771383fe 100644
--- a/regress/usr.bin/ssh/keygen-moduli.sh
+++ b/regress/usr.bin/ssh/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