summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-02-16 05:17:40 +0000
committerngie <ngie@FreeBSD.org>2017-02-16 05:17:40 +0000
commitc24b3d03cce94f25420879d0872869ee08989f08 (patch)
treed5117dc38963ba78a1a8c976210312637d60a891
parent4375a855a9ebfec903c6ee076c8aa62401e43ffc (diff)
downloadFreeBSD-src-c24b3d03cce94f25420879d0872869ee08989f08.zip
FreeBSD-src-c24b3d03cce94f25420879d0872869ee08989f08.tar.gz
MFC r295643:
r295643 (by bdrewery): Test directories can build in parallel fine.
-rw-r--r--bin/sh/tests/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/Makefile2
-rw-r--r--share/mk/bsd.test.mk1
-rw-r--r--tests/sys/Makefile2
-rw-r--r--tests/sys/pjdfstest/tests/Makefile2
-rw-r--r--usr.bin/bmake/tests/Makefile.inc3
6 files changed, 4 insertions, 8 deletions
diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
index a9abc80..d93e19a 100644
--- a/bin/sh/tests/Makefile
+++ b/bin/sh/tests/Makefile
@@ -10,6 +10,4 @@ TESTS_SUBDIRS+= parameters
TESTS_SUBDIRS+= parser
TESTS_SUBDIRS+= set-e
-SUBDIR_PARALLEL=
-
.include <bsd.test.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile b/cddl/usr.sbin/dtrace/tests/common/Makefile
index 02381c6..7c7bb17 100644
--- a/cddl/usr.sbin/dtrace/tests/common/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/Makefile
@@ -86,6 +86,4 @@ TESTS_SUBDIRS+= aggs \
.PATH: ${.CURDIR:H:H:H:H:H}/tests
KYUAFILE= YES
-SUBDIR_PARALLEL=
-
.include <bsd.test.mk>
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index 24c9714..b2c8f91 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -76,6 +76,7 @@ _TESTS=
SUBDIR+= ${ts}
.endif
.endfor
+SUBDIR_PARALLEL= t
.endif
# it is rare for test cases to have man pages
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index c18c387..a11d33e 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -22,6 +22,4 @@ TESTS_SUBDIRS+= vm
# Items not integrated into kyua runs by default
SUBDIR+= pjdfstest
-SUBDIR_PARALLEL=
-
.include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile
index 61b15dd..95b4bbe 100644
--- a/tests/sys/pjdfstest/tests/Makefile
+++ b/tests/sys/pjdfstest/tests/Makefile
@@ -36,6 +36,4 @@ TESTS_SUBDIRS+= symlink
TESTS_SUBDIRS+= truncate
TESTS_SUBDIRS+= unlink
-SUBDIR_PARALLEL=
-
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/Makefile.inc b/usr.bin/bmake/tests/Makefile.inc
new file mode 100644
index 0000000..b2201e4
--- /dev/null
+++ b/usr.bin/bmake/tests/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR_PARALLEL= t
OpenPOWER on IntegriCloud