aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulio Merino <jmmv@FreeBSD.org>2014-04-21 21:39:25 +0000
committerJulio Merino <jmmv@FreeBSD.org>2014-04-21 21:39:25 +0000
commit38f0b757fd84d17d0fc24739a7cda160c4516d81 (patch)
tree891f0c9897443605b2f8f8e0659b0124e71f8c7f
parent236b00df63662264e8ee6d785e14e413740c9ad9 (diff)
downloadsrc-38f0b757fd84d17d0fc24739a7cda160c4516d81.tar.gz
src-38f0b757fd84d17d0fc24739a7cda160c4516d81.zip
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.
Notes
Notes: svn path=/head/; revision=264741
-rw-r--r--cddl/Makefile6
-rw-r--r--cddl/lib/Makefile7
-rw-r--r--cddl/lib/tests/Makefile10
-rw-r--r--cddl/sbin/Makefile6
-rw-r--r--cddl/sbin/tests/Makefile10
-rw-r--r--cddl/tests/Makefile10
-rw-r--r--cddl/usr.bin/Makefile5
-rw-r--r--cddl/usr.bin/tests/Makefile10
-rw-r--r--cddl/usr.sbin/Makefile5
-rw-r--r--cddl/usr.sbin/tests/Makefile10
-rw-r--r--etc/Makefile4
-rw-r--r--etc/mtree/BSD.tests.dist30
-rw-r--r--etc/tests/Makefile10
-rw-r--r--games/Makefile10
-rw-r--r--games/tests/Makefile10
-rw-r--r--gnu/Makefile8
-rw-r--r--gnu/lib/Makefile4
-rw-r--r--gnu/lib/tests/Makefile10
-rw-r--r--gnu/tests/Makefile10
-rw-r--r--gnu/usr.bin/Makefile5
-rw-r--r--gnu/usr.bin/tests/Makefile10
-rw-r--r--secure/Makefile6
-rw-r--r--secure/lib/Makefile4
-rw-r--r--secure/lib/tests/Makefile10
-rw-r--r--secure/libexec/Makefile4
-rw-r--r--secure/libexec/tests/Makefile10
-rw-r--r--secure/tests/Makefile10
-rw-r--r--secure/usr.bin/Makefile4
-rw-r--r--secure/usr.bin/tests/Makefile10
-rw-r--r--secure/usr.sbin/Makefile4
-rw-r--r--secure/usr.sbin/tests/Makefile10
31 files changed, 256 insertions, 6 deletions
diff --git a/cddl/Makefile b/cddl/Makefile
index 801d9cffa015..2a9b6f8089d5 100644
--- a/cddl/Makefile
+++ b/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>
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 53d402a7aaa8..fef13839d9ae 100644
--- a/cddl/lib/Makefile
+++ b/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
diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile
new file mode 100644
index 000000000000..4a49d9fee849
--- /dev/null
+++ b/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>
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index f74307c5fd6a..4fd96f6ee0e5 100644
--- a/cddl/sbin/Makefile
+++ b/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
diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile
new file mode 100644
index 000000000000..91bbaee271f4
--- /dev/null
+++ b/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>
diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile
new file mode 100644
index 000000000000..34a27ea636a0
--- /dev/null
+++ b/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>
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 13d3a86232cb..3547ff7b6994 100644
--- a/cddl/usr.bin/Makefile
+++ b/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
diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile
new file mode 100644
index 000000000000..c94d5910a210
--- /dev/null
+++ b/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>
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index fb2c43738b5c..8551c28a1a0b 100644
--- a/cddl/usr.sbin/Makefile
+++ b/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
diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile
new file mode 100644
index 000000000000..0305aeef1d3b
--- /dev/null
+++ b/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>
diff --git a/etc/Makefile b/etc/Makefile
index 9ca3f2d63c06..dd495e1739f2 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -7,6 +7,10 @@
SUBDIR= sendmail
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
BIN1= crontab \
devd.conf \
devfs.conf \
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 53b50b29f944..4cc3f87b41eb 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/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
diff --git a/etc/tests/Makefile b/etc/tests/Makefile
new file mode 100644
index 000000000000..5aacd5b19e57
--- /dev/null
+++ b/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>
diff --git a/games/Makefile b/games/Makefile
index 214a394f4495..716a7861db5d 100644
--- a/games/Makefile
+++ b/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>
diff --git a/games/tests/Makefile b/games/tests/Makefile
new file mode 100644
index 000000000000..45f93d9343bb
--- /dev/null
+++ b/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>
diff --git a/gnu/Makefile b/gnu/Makefile
index 6656adfbdfad..b460590387ae 100644
--- a/gnu/Makefile
+++ b/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>
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 61ea14bf122c..0a607d7afa86 100644
--- a/gnu/lib/Makefile
+++ b/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"
diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile
new file mode 100644
index 000000000000..256e24512e30
--- /dev/null
+++ b/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>
diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile
new file mode 100644
index 000000000000..de42fae1ec00
--- /dev/null
+++ b/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>
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 02d0b2a95375..7e96a6f4829f 100644
--- a/gnu/usr.bin/Makefile
+++ b/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
diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile
new file mode 100644
index 000000000000..eebbff675d2e
--- /dev/null
+++ b/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>
diff --git a/secure/Makefile b/secure/Makefile
index 4edfa73e2c08..4a111a25c548 100644
--- a/secure/Makefile
+++ b/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 \
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index e27bcc39dd49..118204f67f8a 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -10,4 +10,8 @@ SUBDIR+=libssh
.endif
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
.include <bsd.subdir.mk>
diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile
new file mode 100644
index 000000000000..cd6bcff5f3c9
--- /dev/null
+++ b/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>
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 0c680e4d7b9a..9edc8e66c197 100644
--- a/secure/libexec/Makefile
+++ b/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>
diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile
new file mode 100644
index 000000000000..6debef892a59
--- /dev/null
+++ b/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>
diff --git a/secure/tests/Makefile b/secure/tests/Makefile
new file mode 100644
index 000000000000..2e6dbc487fdc
--- /dev/null
+++ b/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>
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index b10a43b350d0..e819ba74686c 100644
--- a/secure/usr.bin/Makefile
+++ b/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>
diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile
new file mode 100644
index 000000000000..1c06699c587a
--- /dev/null
+++ b/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>
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
index e08025c8b81b..33d945c0c683 100644
--- a/secure/usr.sbin/Makefile
+++ b/secure/usr.sbin/Makefile
@@ -7,4 +7,8 @@ SUBDIR=
SUBDIR+=sshd
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
.include <bsd.subdir.mk>
diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile
new file mode 100644
index 000000000000..25e95f03cdea
--- /dev/null
+++ b/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>