From d3157f0915de68e31329ae9ebadfed4147283e94 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 16 Feb 2016 02:13:59 +0000
Subject: [PATCH] Test directories can build in parallel fine.

Sponsored by:	EMC / Isilon Storage Division
---
 bin/sh/tests/Makefile                      | 2 --
 cddl/usr.sbin/dtrace/tests/common/Makefile | 2 --
 share/mk/bsd.test.mk                       | 1 +
 tests/sys/Makefile                         | 2 --
 tests/sys/pjdfstest/tests/Makefile         | 2 --
 usr.bin/bmake/tests/Makefile.inc           | 3 +++
 6 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 usr.bin/bmake/tests/Makefile.inc

diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
index a9abc80311d1..d93e19aea7e1 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 02381c66e391..7c7bb1718d05 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 d5936b9103d7..79018a4311a9 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -68,6 +68,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 18a24a452f00..36bdde067e8d 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 61b15dd12c25..95b4bbe29b41 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 000000000000..b2201e4ea349
--- /dev/null
+++ b/usr.bin/bmake/tests/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR_PARALLEL= t