[Midnightbsd-cvs] src [10263] trunk/share/mk/bsd.test.mk: fixup targets
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 2 18:04:31 EDT 2018
Revision: 10263
http://svnweb.midnightbsd.org/src/?rev=10263
Author: laffer1
Date: 2018-06-02 18:04:30 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
fixup targets
Modified Paths:
--------------
trunk/share/mk/bsd.test.mk
Modified: trunk/share/mk/bsd.test.mk
===================================================================
--- trunk/share/mk/bsd.test.mk 2018-06-02 22:03:54 UTC (rev 10262)
+++ trunk/share/mk/bsd.test.mk 2018-06-02 22:04:30 UTC (rev 10263)
@@ -1,5 +1,5 @@
# $MidnightBSD$
-# $FreeBSD: stable/10/share/mk/bsd.test.mk 289054 2015-10-08 20:32:44Z bdrewery $
+# $FreeBSD: stable/10/share/mk/bsd.test.mk 313791 2017-02-16 05:17:40Z ngie $
#
# Generic build infrastructure for test programs.
#
@@ -11,6 +11,12 @@
__<bsd.test.mk>__:
+# Third-party software (kyua, etc) prefix.
+LOCALBASE?= /usr/local
+
+# Tests install directory
+TESTSDIR?= ${TESTSBASE}/${RELDIR:H}
+
# List of subdirectories containing tests into which to recurse. This has the
# same semantics as SUBDIR at build-time. However, the directories listed here
# get registered into the run-time test suite definitions so that the test
@@ -63,11 +69,16 @@
.include <plain.test.mk>
.include <tap.test.mk>
+# kyua automatically descends directories; only run make check on the
+# top-level directory
+.if !make(check)
.for ts in ${TESTS_SUBDIRS}
.if empty(SUBDIR:M${ts})
SUBDIR+= ${ts}
.endif
.endfor
+SUBDIR_PARALLEL= t
+.endif
# it is rare for test cases to have man pages
.if !defined(MAN)
@@ -74,31 +85,17 @@
MAN=
.endif
-# tell progs.mk we might want to install things
-PROG_VARS+= BINDIR
-PROGS_TARGETS+= install
-
.if !defined(NOT_FOR_TEST_SUITE)
.include <suite.test.mk>
.endif
-.if !target(realtest)
-realtest: .PHONY
+.if !target(realcheck)
+realcheck: .PHONY
@echo "$@ not defined; skipping"
.endif
-test: .PHONY
-.ORDER: beforetest realtest
-test: beforetest realtest
+beforecheck realcheck aftercheck check: .PHONY
+.ORDER: beforecheck realcheck aftercheck
+check: beforecheck realcheck aftercheck
-.if target(aftertest)
-.ORDER: realtest aftertest
-test: aftertest
-.endif
-
-.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
.include <bsd.progs.mk>
-.endif
-.include <bsd.files.mk>
-
-.include <bsd.obj.mk>
More information about the Midnightbsd-cvs
mailing list