upstream commit

use SUBDIR to recuse into unit tests; makes "make obj"
 actually work
This commit is contained in:
djm@openbsd.org 2015-01-20 22:58:57 +00:00 committed by Damien Miller
parent 1d1092bff8
commit 2b3b1c1e4b
2 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.76 2015/01/18 22:00:18 djm Exp $
# $OpenBSD: Makefile,v 1.77 2015/01/20 22:58:57 djm Exp $
REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
tests: $(REGRESS_TARGETS)
@ -205,4 +205,6 @@ unit:
${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
${.OBJDIR}/unittests/sshkey/test_sshkey \
-d ${.CURDIR}//unittests/sshkey/testdata ; \
${.OBJDIR}/unittests/bitmap/test_bitmap ; \
${.OBJDIR}/unittests/kex/test_kex ; \
fi

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $
# $OpenBSD: Makefile,v 1.2 2015/01/20 22:58:57 djm Exp $
LIB= test_helper
SRCS= test_helper.c fuzz.c
@ -7,6 +7,9 @@ DEBUGLIBS= no
NOPROFILE= yes
NOPIC= yes
# Hack to allow building with SUBDIR in ../../Makefile
regress: all
install:
@echo -n