Import openssh_6.7p1.orig.tar.gz

1 files changed, 10 insertions, 2 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 6e3b8d634..3feb7a997 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
-#       $OpenBSD: Makefile,v 1.68 2014/01/25 04:35:32 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.70 2014/06/24 01:14:17 djm Exp $
 
-REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec
+REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t-exec
 tests:          $(REGRESS_TARGETS)
 
 # Interop tests are not run by default
@@ -180,3 +180,11 @@ t-exec-interop:	${INTEROP_TESTS:=.sh}
 
 # Not run by default
 interop: ${INTEROP_TARGETS}
+
+# Unit tests, built by top-level Makefile
+unit:
+        set -e ; if test -z "${SKIP_UNIT}" ; then \
+                ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
+                ${.OBJDIR}/unittests/sshkey/test_sshkey \
+                        -d  ${.CURDIR}//unittests/sshkey/testdata ; \
+        fi