diff options
-rw-r--r-- | regress/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile index 62e55533b..925edf71a 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.99 2018/12/15 00:50:21 tedu Exp $ | 1 | # $OpenBSD: Makefile,v 1.100 2019/01/20 23:24:19 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec | 3 | REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec |
4 | tests: prep $(REGRESS_TARGETS) | 4 | tests: prep $(REGRESS_TARGETS) |
@@ -91,7 +91,8 @@ LTESTS= connect \ | |||
91 | INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers | 91 | INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers |
92 | #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 92 | #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
93 | 93 | ||
94 | #LTESTS= cipher-speed | 94 | EXTRA_TESTS= agent-pkcs11 |
95 | #EXTRA_TESTS+= cipher-speed | ||
95 | 96 | ||
96 | USERNAME= ${LOGNAME} | 97 | USERNAME= ${LOGNAME} |
97 | CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ | 98 | CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ |
@@ -214,6 +215,13 @@ t-exec-interop: ${INTEROP_TESTS:=.sh} | |||
214 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 215 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
215 | done | 216 | done |
216 | 217 | ||
218 | t-extra: ${EXTRA_TESTS:=.sh} | ||
219 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | ||
220 | for TEST in ""$?; do \ | ||
221 | echo "run test $${TEST}" ... 1>&2; \ | ||
222 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | ||
223 | done | ||
224 | |||
217 | # Not run by default | 225 | # Not run by default |
218 | interop: ${INTEROP_TARGETS} | 226 | interop: ${INTEROP_TARGETS} |
219 | 227 | ||