Author: jmmv
Date: Mon Apr 21 21:39:25 2014
New Revision: 264741
URL: http://svnweb.freebsd.org/changeset/base/264741
Log:
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.
Added:
head/cddl/lib/tests/
head/cddl/lib/tests/Makefile (contents, props changed)
head/cddl/sbin/tests/
head/cddl/sbin/tests/Makefile (contents, props changed)
head/cddl/tests/
head/cddl/tests/Makefile (contents, props changed)
head/cddl/usr.bin/tests/
head/cddl/usr.bin/tests/Makefile (contents, props changed)
head/cddl/usr.sbin/tests/
head/cddl/usr.sbin/tests/Makefile (contents, props changed)
head/etc/tests/
head/etc/tests/Makefile (contents, props changed)
head/games/tests/
head/games/tests/Makefile (contents, props changed)
head/gnu/lib/tests/
head/gnu/lib/tests/Makefile (contents, props changed)
head/gnu/tests/
head/gnu/tests/Makefile (contents, props changed)
head/gnu/usr.bin/tests/
head/gnu/usr.bin/tests/Makefile (contents, props changed)
head/secure/lib/tests/
head/secure/lib/tests/Makefile (contents, props changed)
head/secure/libexec/tests/
head/secure/libexec/tests/Makefile (contents, props changed)
head/secure/tests/
head/secure/tests/Makefile (contents, props changed)
head/secure/usr.bin/tests/
head/secure/usr.bin/tests/Makefile (contents, props changed)
head/secure/usr.sbin/tests/
head/secure/usr.sbin/tests/Makefile (contents, props changed)
Modified:
head/cddl/Makefile
head/cddl/lib/Makefile
head/cddl/sbin/Makefile
head/cddl/usr.bin/Makefile
head/cddl/usr.sbin/Makefile
head/etc/Makefile
head/etc/mtree/BSD.tests.dist
head/games/Makefile
head/gnu/Makefile
head/gnu/lib/Makefile
head/gnu/usr.bin/Makefile
head/secure/Makefile
head/secure/lib/Makefile
head/secure/libexec/Makefile
head/secure/usr.bin/Makefile
head/secure/usr.sbin/Makefile
Modified: head/cddl/Makefile
==============================================================================
--- head/cddl/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/cddl/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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>
Modified: head/cddl/lib/Makefile
==============================================================================
--- head/cddl/lib/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/cddl/lib/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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
Added: head/cddl/lib/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/lib/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Modified: head/cddl/sbin/Makefile
==============================================================================
--- head/cddl/sbin/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/cddl/sbin/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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
Added: head/cddl/sbin/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/sbin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Added: head/cddl/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/tests/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/cddl
+
+.PATH: ${.CURDIR:H:H}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>
Modified: head/cddl/usr.bin/Makefile
==============================================================================
--- head/cddl/usr.bin/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/cddl/usr.bin/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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
Added: head/cddl/usr.bin/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/usr.bin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Modified: head/cddl/usr.sbin/Makefile
==============================================================================
--- head/cddl/usr.sbin/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/cddl/usr.sbin/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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
Added: head/cddl/usr.sbin/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/usr.sbin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/etc/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -7,6 +7,10 @@
SUBDIR= sendmail
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
BIN1= crontab \
devd.conf \
devfs.conf \
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Mon Apr 21 19:33:27 2014
(r264740)
+++ head/etc/mtree/BSD.tests.dist Mon Apr 21 21:39:25 2014
(r264741)
@@ -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
Added: head/etc/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/tests/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/etc
+
+.PATH: ${.CURDIR:H:H}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>
Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/games/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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>
Added: head/games/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/tests/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/games
+
+.PATH: ${.CURDIR:H:H}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>
Modified: head/gnu/Makefile
==============================================================================
--- head/gnu/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/gnu/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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>
Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/gnu/lib/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -8,6 +8,10 @@ SUBDIR= csu libgcc libgcov libdialog lib
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"
Added: head/gnu/lib/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/gnu/lib/tests/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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>
Added: head/gnu/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/gnu/tests/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/gnu
+
+.PATH: ${.CURDIR:H:H}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>
Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/gnu/usr.bin/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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
Added: head/gnu/usr.bin/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/gnu/usr.bin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Modified: head/secure/Makefile
==============================================================================
--- head/secure/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/secure/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -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 \
Modified: head/secure/lib/Makefile
==============================================================================
--- head/secure/lib/Makefile Mon Apr 21 19:33:27 2014 (r264740)
+++ head/secure/lib/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -10,4 +10,8 @@ SUBDIR+=libssh
.endif
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
.include <bsd.subdir.mk>
Added: head/secure/lib/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/secure/lib/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Modified: head/secure/libexec/Makefile
==============================================================================
--- head/secure/libexec/Makefile Mon Apr 21 19:33:27 2014
(r264740)
+++ head/secure/libexec/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Added: head/secure/libexec/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/secure/libexec/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Added: head/secure/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/secure/tests/Makefile Mon Apr 21 21:39:25 2014 (r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/secure
+
+.PATH: ${.CURDIR:H:H}/tests
+KYUAFILE= yes
+
+.include <bsd.test.mk>
Modified: head/secure/usr.bin/Makefile
==============================================================================
--- head/secure/usr.bin/Makefile Mon Apr 21 19:33:27 2014
(r264740)
+++ head/secure/usr.bin/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -10,4 +10,8 @@ SUBDIR+=scp sftp ssh ssh-add ssh-agent s
.endif
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
.include <bsd.subdir.mk>
Added: head/secure/usr.bin/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/secure/usr.bin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
Modified: head/secure/usr.sbin/Makefile
==============================================================================
--- head/secure/usr.sbin/Makefile Mon Apr 21 19:33:27 2014
(r264740)
+++ head/secure/usr.sbin/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -7,4 +7,8 @@ SUBDIR=
SUBDIR+=sshd
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
.include <bsd.subdir.mk>
Added: head/secure/usr.sbin/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/secure/usr.sbin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -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>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
