summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile
index ac1ee2d5f..dd3b79506 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
1# $OpenBSD: Makefile,v 1.72 2014/12/22 08:06:03 djm Exp $ 1# $OpenBSD: Makefile,v 1.73 2015/01/12 20:13:27 markus Exp $
2 2
3REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t-exec 3REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
5 5
6# Interop tests are not run by default 6# Interop tests are not run by default
@@ -76,6 +76,7 @@ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers
76USER!= id -un 76USER!= id -un
77CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ 77CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
78 t8.out t8.out.pub t9.out t9.out.pub t10.out t10.out.pub \ 78 t8.out t8.out.pub t9.out t9.out.pub t10.out t10.out.pub \
79 t12.out t12.out.pub \
79 authorized_keys_${USER} known_hosts pidfile testdata \ 80 authorized_keys_${USER} known_hosts pidfile testdata \
80 ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \ 81 ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
81 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ 82 rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
@@ -169,6 +170,12 @@ t11:
169 ${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\ 170 ${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\
170 awk '{print $$2}' | diff - ${.CURDIR}/t11.ok 171 awk '{print $$2}' | diff - ${.CURDIR}/t11.ok
171 172
173t12.out:
174 ssh-keygen -q -t ed25519 -N '' -C 'test-comment-1234' -f $@
175
176t12: t12.out
177 ssh-keygen -lf t12.out.pub | grep -q test-comment-1234
178
172t-exec: ${LTESTS:=.sh} 179t-exec: ${LTESTS:=.sh}
173 @if [ "x$?" = "x" ]; then exit 0; fi; \ 180 @if [ "x$?" = "x" ]; then exit 0; fi; \
174 for TEST in ""$?; do \ 181 for TEST in ""$?; do \