d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add placeholder Kyuafiles for various top-level hierarchies.

Browse Source 
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.
This commit is contained in:
jmmv 2014-04-21 21:39:25 +00:00
parent c5b1d984c7
commit 64b466d8f8
31 changed files with 256 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cddl/Makefile
View File

@ -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>

7
cddl/lib/Makefile
View File

@ -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

10
cddl/lib/tests/Makefile Normal file
View File

@ -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>

6
cddl/sbin/Makefile
View File

@ -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

10
cddl/sbin/tests/Makefile Normal file
View File

@ -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>

10
cddl/tests/Makefile Normal file
View File

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

5
cddl/usr.bin/Makefile
View File

@ -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

10
cddl/usr.bin/tests/Makefile Normal file
View File

@ -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>

5
cddl/usr.sbin/Makefile
View File

@ -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

10
cddl/usr.sbin/tests/Makefile Normal file
View File

@ -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>

4
etc/Makefile
View File

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

30
etc/mtree/BSD.tests.dist
View File

@ -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

10
etc/tests/Makefile Normal file
View File

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

10
games/Makefile
View File

@ -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>

10
games/tests/Makefile Normal file
View File

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

8
gnu/Makefile
View File

@ -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>

4
gnu/lib/Makefile
View File

@ -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"

10
gnu/lib/tests/Makefile Normal file
View File

@ -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>

10
gnu/tests/Makefile Normal file
View File

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

5
gnu/usr.bin/Makefile
View File

@ -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

10
gnu/usr.bin/tests/Makefile Normal file
View File

@ -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>

6
secure/Makefile
View File

@ -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 \

4
secure/lib/Makefile
View File

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

10
secure/lib/tests/Makefile Normal file
View File

@ -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>

4
secure/libexec/Makefile
View File

@ -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>

10
secure/libexec/tests/Makefile Normal file
View File

@ -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>

10
secure/tests/Makefile Normal file
View File

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

4
secure/usr.bin/Makefile
View File

@ -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>

10
secure/usr.bin/tests/Makefile Normal file
View File

@ -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>

4
secure/usr.sbin/Makefile
View File

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

10
secure/usr.sbin/tests/Makefile Normal file
View File

@ -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>