From 64b466d8f8f24140631d148b4bbad65719b5d4ba Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@FreeBSD.org>
Date: Mon, 21 Apr 2014 21:39:25 +0000
Subject: 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.
---
 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 ++++++++++
 10 files changed, 71 insertions(+), 1 deletion(-)
 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

(limited to 'secure')

diff --git a/secure/Makefile b/secure/Makefile
index 4edfa73..4a111a2 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>
-- 
cgit v1.1