Add placeholder Kyuafiles for various top-level hierarchies.

This change adds tests/ directories in the source tree to create various
subdirectories in /usr/tests/ and to install placeholder Kyuafiles for
them.

the relevant hierarchies are: cddl, etc, games, gnu and secure.

The reason for this is to simplify the addition of new test programs for
utilities or libraries under any of these directories.  Doing so on a
case by case basis is unnecessary and is quite an obscure process.

cddl/Makefile

@@ -1,5 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR=	lib sbin usr.bin usr.sbin
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>

cddl/lib/Makefile

@@ -11,7 +11,12 @@ SUBDIR=	${_drti} \
 	libuutil \
 	${_libzfs_core} \
 	${_libzfs} \
-	${_libzpool}
+	${_libzpool} \
+	${_tests}
+
+.if ${MK_TESTS} != "no"
+_tests=		tests
+.endif
 
 .if ${MK_ZFS} != "no"
 _libzfs_core=	libzfs_core

cddl/lib/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/cddl/lib
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

cddl/sbin/Makefile

@@ -2,7 +2,11 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	${_zfs} ${_zpool}
+SUBDIR=	${_tests} ${_zfs} ${_zpool}
+
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
 
 .if ${MK_ZFS} != "no"
 _zfs=	zfs

cddl/sbin/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/cddl/sbin
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

cddl/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/cddl
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

cddl/usr.bin/Makefile

@@ -7,11 +7,16 @@ SUBDIR= \
 	ctfdump \
 	ctfmerge \
 	sgsmsg \
+	${_tests} \
 	${_zinject} \
 	${_zlook} \
 	${_zstreamdump} \
 	${_ztest}
 
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
+
 .if ${MK_ZFS} != "no"
 _zinject= zinject
 #_zlook= zlook

cddl/usr.bin/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/cddl/usr.bin
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

cddl/usr.sbin/Makefile

@@ -5,9 +5,14 @@
 SUBDIR=	${_dtrace} \
 	${_dtruss} \
 	${_lockstat} \
+	${_tests} \
 	${_zdb} \
 	${_zhack}
 
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
+
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no"
 _zdb=	zdb

cddl/usr.sbin/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/cddl/usr.sbin
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

etc/Makefile

@@ -7,6 +7,10 @@
 SUBDIR=	sendmail
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 BIN1=	crontab \
 	devd.conf \
 	devfs.conf \

etc/mtree/BSD.tests.dist

@@ -50,6 +50,26 @@
             test
             ..
         ..
+        cddl
+            lib
+            ..
+            sbin
+            ..
+            usr.bin
+            ..
+            usr.sbin
+            ..
+        ..
+        etc
+        ..
+        games
+        ..
+        gnu
+            lib
+            ..
+            usr.bin
+            ..
+        ..
         lib
             atf
                 libatf-c
@@ -82,6 +102,16 @@
             mdconfig
             ..
         ..
+        secure
+            lib
+            ..
+            libexec
+            ..
+            usr.bin
+            ..
+            usr.sbin
+            ..
+        ..
         share
             examples
                 tests

etc/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/etc
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

games/Makefile

@@ -1,6 +1,7 @@
-#	@(#)Makefile	8.2 (Berkeley) 3/31/94
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SUBDIR= \
 	bcd \
 	caesar \
@@ -12,6 +13,11 @@ SUBDIR= \
 	pom \
 	ppt \
 	primes \
-	random
+	random \
+	${_tests}
+
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
 
 .include <bsd.subdir.mk>

games/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/games
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

gnu/Makefile

@@ -1,6 +1,12 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
 # $FreeBSD$
 
-SUBDIR= lib usr.bin
+.include <bsd.own.mk>
+
+SUBDIR= lib ${_tests} usr.bin
+
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
 
 .include <bsd.subdir.mk>

gnu/lib/Makefile

@@ -8,6 +8,10 @@ SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline
 SUBDIR+= libssp
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
 .if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"

gnu/lib/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/gnu/lib
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

gnu/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/gnu
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

gnu/usr.bin/Makefile

@@ -15,6 +15,7 @@ SUBDIR= ${_binutils} \
 	${_rcs} \
 	sdiff \
 	send-pr \
+	${_tests} \
 	${_texinfo}
 
 .if ${MK_CXX} != "no"
@@ -36,6 +37,10 @@ _texinfo=	texinfo
 _rcs=		rcs
 .endif
 
+.if ${MK_TESTS} != "no"
+_tests=		tests
+.endif
+
 .if ${MK_BINUTILS} != "no"
 _binutils=	binutils
 .endif

gnu/usr.bin/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/gnu/usr.bin
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

secure/Makefile

@@ -2,7 +2,11 @@
 
 .include <bsd.own.mk>
 
-SUBDIR= lib libexec usr.bin usr.sbin
+SUBDIR= lib libexec ${_tests} usr.bin usr.sbin
+
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
 
 # These are the programs which depend on crypto, but not Kerberos.
 SPROGS=	lib/libfetch lib/libpam lib/libradius lib/libtelnet	\

secure/lib/Makefile

@@ -10,4 +10,8 @@ SUBDIR+=libssh
 .endif
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>

secure/lib/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/secure/lib
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

secure/libexec/Makefile

@@ -7,4 +7,8 @@ SUBDIR=
 SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>

secure/libexec/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/secure/libexec
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

secure/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/secure
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

secure/usr.bin/Makefile

@@ -10,4 +10,8 @@ SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
 .endif
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>

secure/usr.bin/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/secure/usr.bin
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>

secure/usr.sbin/Makefile

@@ -7,4 +7,8 @@ SUBDIR=
 SUBDIR+=sshd
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>

secure/usr.sbin/tests/Makefile

@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/secure/usr.sbin
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>