diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-20 23:24:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-21 11:51:54 +1100 |
| commit | b2ce8b31a1f974a13e6d12e0a0c132b50bc45115 (patch) | |
| tree | 1c84b738bd5a70612f7a3401da9ee64494170d23 /regress/Makefile | |
| parent | 632976418d60b7193597bbc6ac7ca33981a41aab (diff) | |
| download | openssh-git-b2ce8b31a1f974a13e6d12e0a0c132b50bc45115.tar.gz | |
upstream: add "extra:" target to run some extra tests that are not
enabled by default (currently includes agent-pkcs11.sh); from markus@
OpenBSD-Regress-ID: 9a969e1adcd117fea174d368dcb9c61eb50a2a3c
Diffstat (limited to 'regress/Makefile')
| -rw-r--r-- | regress/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile index 62e55533..925edf71 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.99 2018/12/15 00:50:21 tedu Exp $ +# $OpenBSD: Makefile,v 1.100 2019/01/20 23:24:19 djm Exp $ REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec tests: prep $(REGRESS_TARGETS) @@ -91,7 +91,8 @@ LTESTS= connect \ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp -#LTESTS= cipher-speed +EXTRA_TESTS= agent-pkcs11 +#EXTRA_TESTS+= cipher-speed USERNAME= ${LOGNAME} CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ @@ -214,6 +215,13 @@ t-exec-interop: ${INTEROP_TESTS:=.sh} (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ done +t-extra: ${EXTRA_TESTS:=.sh} + @if [ "x$?" = "x" ]; then exit 0; fi; \ + for TEST in ""$?; do \ + echo "run test $${TEST}" ... 1>&2; \ + (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ + done + # Not run by default interop: ${INTEROP_TARGETS} |