diff options
31 files changed, 256 insertions, 6 deletions
diff --git a/cddl/Makefile b/cddl/Makefile index 801d9cf..2a9b6f8 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 53d402a..fef1383 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 0000000..4a49d9f --- /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 f74307c..4fd96f6 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 0000000..91bbaee --- /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 0000000..34a27ea --- /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 13d3a86..3547ff7 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 0000000..c94d591 --- /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 fb2c437..8551c28 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 0000000..0305aee --- /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 55ecee9..6a5a56f 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 5035042..2f5b95f 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 @@ -80,6 +100,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 0000000..5aacd5b --- /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 214a394..716a786 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 0000000..45f93d9 --- /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 6656adf..b460590 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 50797fc..70e6811 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" diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile new file mode 100644 index 0000000..256e245 --- /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 0000000..de42fae --- /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 02d0b2a..7e96a6f 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 0000000..eebbff6 --- /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 7342709..21b05f2 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 e27bcc3..118204f 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 0000000..cd6bcff --- /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 0c680e4..9edc8e6 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 0000000..6debef8 --- /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 0000000..2e6dbc4 --- /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 b10a43b..e819ba7 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 0000000..1c06699 --- /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 e08025c..33d945c 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 0000000..25e95f0 --- /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> |
