From 6ea65b62f06cf745a0a18e94e8b0706326b525b7 Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 28 Apr 2014 04:20:14 +0000 Subject: [PATCH] MFC r264741: Add placeholder Kyuafiles for various top-level hierarchies. This is "make tinderbox" clean. git-svn-id: svn://svn.freebsd.org/base/stable/10@265037 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/Makefile | 6 ++++++ cddl/lib/Makefile | 7 ++++++- cddl/lib/tests/Makefile | 10 ++++++++++ cddl/sbin/Makefile | 6 +++++- cddl/sbin/tests/Makefile | 10 ++++++++++ cddl/tests/Makefile | 10 ++++++++++ cddl/usr.bin/Makefile | 5 +++++ cddl/usr.bin/tests/Makefile | 10 ++++++++++ cddl/usr.sbin/Makefile | 5 +++++ cddl/usr.sbin/tests/Makefile | 10 ++++++++++ etc/Makefile | 4 ++++ etc/mtree/BSD.tests.dist | 30 ++++++++++++++++++++++++++++++ etc/tests/Makefile | 10 ++++++++++ games/Makefile | 10 ++++++++-- games/tests/Makefile | 10 ++++++++++ gnu/Makefile | 8 +++++++- gnu/lib/Makefile | 4 ++++ gnu/lib/tests/Makefile | 10 ++++++++++ gnu/tests/Makefile | 10 ++++++++++ gnu/usr.bin/Makefile | 5 +++++ gnu/usr.bin/tests/Makefile | 10 ++++++++++ secure/Makefile | 6 +++++- secure/lib/Makefile | 4 ++++ secure/lib/tests/Makefile | 10 ++++++++++ secure/libexec/Makefile | 4 ++++ secure/libexec/tests/Makefile | 10 ++++++++++ secure/tests/Makefile | 10 ++++++++++ secure/usr.bin/Makefile | 4 ++++ secure/usr.bin/tests/Makefile | 10 ++++++++++ secure/usr.sbin/Makefile | 4 ++++ secure/usr.sbin/tests/Makefile | 10 ++++++++++ 31 files changed, 256 insertions(+), 6 deletions(-) create mode 100644 cddl/lib/tests/Makefile create mode 100644 cddl/sbin/tests/Makefile create mode 100644 cddl/tests/Makefile create mode 100644 cddl/usr.bin/tests/Makefile create mode 100644 cddl/usr.sbin/tests/Makefile create mode 100644 etc/tests/Makefile create mode 100644 games/tests/Makefile create mode 100644 gnu/lib/tests/Makefile create mode 100644 gnu/tests/Makefile create mode 100644 gnu/usr.bin/tests/Makefile create mode 100644 secure/lib/tests/Makefile create mode 100644 secure/libexec/tests/Makefile create mode 100644 secure/tests/Makefile create mode 100644 secure/usr.bin/tests/Makefile create mode 100644 secure/usr.sbin/tests/Makefile diff --git a/cddl/Makefile b/cddl/Makefile index 801d9cffa..2a9b6f808 100644 --- a/cddl/Makefile +++ b/cddl/Makefile @@ -1,5 +1,11 @@ # $FreeBSD$ +.include + SUBDIR= lib sbin usr.bin usr.sbin +.if ${MK_TESTS} != "no" +SUBDIR+=tests +.endif + .include diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 53d402a7a..fef13839d 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 000000000..4a49d9fee --- /dev/null +++ b/cddl/lib/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/cddl/lib + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile index f74307c5f..4fd96f6ee 100644 --- a/cddl/sbin/Makefile +++ b/cddl/sbin/Makefile @@ -2,7 +2,11 @@ .include -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 000000000..91bbaee27 --- /dev/null +++ b/cddl/sbin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/cddl/sbin + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile new file mode 100644 index 000000000..34a27ea63 --- /dev/null +++ b/cddl/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/cddl + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index 13d3a8623..3547ff7b6 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 000000000..c94d5910a --- /dev/null +++ b/cddl/usr.bin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/cddl/usr.bin + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index fb2c43738..8551c28a1 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 000000000..0305aeef1 --- /dev/null +++ b/cddl/usr.sbin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/cddl/usr.sbin + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/etc/Makefile b/etc/Makefile index 55ecee985..6a5a56f5c 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 503504295..2f5b95f3e 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 000000000..5aacd5b19 --- /dev/null +++ b/etc/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/etc + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include diff --git a/games/Makefile b/games/Makefile index 214a394f4..716a7861d 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1,6 +1,7 @@ -# @(#)Makefile 8.2 (Berkeley) 3/31/94 # $FreeBSD$ +.include + SUBDIR= \ bcd \ caesar \ @@ -12,6 +13,11 @@ SUBDIR= \ pom \ ppt \ primes \ - random + random \ + ${_tests} + +.if ${MK_TESTS} != "no" +_tests= tests +.endif .include diff --git a/games/tests/Makefile b/games/tests/Makefile new file mode 100644 index 000000000..45f93d934 --- /dev/null +++ b/games/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/games + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include diff --git a/gnu/Makefile b/gnu/Makefile index 6656adfbd..b46059038 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 + +SUBDIR= lib ${_tests} usr.bin + +.if ${MK_TESTS} != "no" +_tests= tests +.endif .include diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 50797fced..70e68113f 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 000000000..256e24512 --- /dev/null +++ b/gnu/lib/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/gnu/lib + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile new file mode 100644 index 000000000..de42fae1e --- /dev/null +++ b/gnu/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/gnu + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 02d0b2a95..7e96a6f48 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 000000000..eebbff675 --- /dev/null +++ b/gnu/usr.bin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/gnu/usr.bin + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/secure/Makefile b/secure/Makefile index 7342709e1..21b05f2d1 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -2,7 +2,11 @@ .include -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 e27bcc39d..118204f67 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 diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile new file mode 100644 index 000000000..cd6bcff5f --- /dev/null +++ b/secure/lib/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/secure/lib + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 0c680e4d7..9edc8e66c 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 diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile new file mode 100644 index 000000000..6debef892 --- /dev/null +++ b/secure/libexec/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/secure/libexec + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/secure/tests/Makefile b/secure/tests/Makefile new file mode 100644 index 000000000..2e6dbc487 --- /dev/null +++ b/secure/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/secure + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index b10a43b35..e819ba746 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 diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile new file mode 100644 index 000000000..1c06699c5 --- /dev/null +++ b/secure/usr.bin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/secure/usr.bin + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile index e08025c8b..33d945c0c 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 diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile new file mode 100644 index 000000000..25e95f03c --- /dev/null +++ b/secure/usr.sbin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/secure/usr.sbin + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include -- 2.42.0