diff options
Diffstat (limited to 'regress/Makefile')
-rw-r--r-- | regress/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/Makefile b/regress/Makefile index 370f28a99..09ceee734 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.69 2014/04/30 05:32:00 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.70 2014/06/24 01:14:17 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec | 3 | REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -102,9 +102,6 @@ TEST_SSH_SSHKEYGEN?=ssh-keygen | |||
102 | 102 | ||
103 | CPPFLAGS=-I.. | 103 | CPPFLAGS=-I.. |
104 | 104 | ||
105 | unit: | ||
106 | (set -e ; cd ${.CURDIR}/unittests ; make) | ||
107 | |||
108 | t1: | 105 | t1: |
109 | ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv | 106 | ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |
110 | tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv | 107 | tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv |
@@ -186,4 +183,7 @@ interop: ${INTEROP_TARGETS} | |||
186 | 183 | ||
187 | # Unit tests, built by top-level Makefile | 184 | # Unit tests, built by top-level Makefile |
188 | unit: | 185 | unit: |
189 | ${.OBJDIR}/unittests/sshbuf/test_sshbuf | 186 | set -e ; if test -z "${SKIP_UNIT}" ; then \ |
187 | ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ | ||
188 | ${.OBJDIR}/unittests/sshkey/test_sshkey ; \ | ||
189 | fi | ||