26 files changed, 277 insertions, 11 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 37f37e91800f..d56811bea51a 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -6,7 +6,27 @@
 /set type=dir uname=root gname=wheel mode=0755
 .
     lib
+        atf
+            libatf-c
+            ..
+            libatf-c++
+            ..
+            test-programs
+            ..
+        ..
         libcrypt
         ..
     ..
+    libexec
+        atf
+            atf-check
+            ..
+        ..
+    ..
+    usr.bin
+        atf
+            atf-sh
+            ..
+        ..
+    ..
 ..
diff --git a/lib/atf/Makefile b/lib/atf/Makefile
index 0da9aa8a46aa..a191f0da4d47 100644
--- a/lib/atf/Makefile
+++ b/lib/atf/Makefile
@@ -27,9 +27,13 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=		\
-		libatf-c \
-		libatf-c++
+SUBDIR=		libatf-c \
+		libatf-c++ \
+                ${_tests}
+
+.if ${MK_TESTS} != "no"
+_tests= 	tests
+.endif
 
 .ORDER: ${SUBDIR}
 
diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
index 937187add1d3..15e7517f0bc5 100644
--- a/lib/atf/Makefile.inc
+++ b/lib/atf/Makefile.inc
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-ATF=		${.CURDIR}/../../../contrib/atf
-
 _CFLAGS:=	${CFLAGS}
 _CPPFLAGS:=	${CPPFLAGS}
 _CXXFLAGS:=	${CXXFLAGS}
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 37d6073dbb3e..96f620b9deee 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -36,6 +36,7 @@ LDADD=		-latf-c
 
 LDFLAGS+=	-L${.OBJDIR}/../libatf-c
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
@@ -73,4 +74,8 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 
 MAN=		atf-c++-api.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR=		tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/atf/libatf-c++/Makefile.inc b/lib/atf/libatf-c++/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/lib/atf/libatf-c++/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
new file mode 100644
index 000000000000..68eacdeb7a2c
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-c++
+.PATH:		${ATF}/atf-c++/detail
+
+CFLAGS+=	-I${ATF}
+
+FILESDIR=	${TESTSDIR}
+FILES=		macros_hpp_test.cpp
+FILES+=		unused_test.cpp
+
+# Tests in atf-c++.
+.for _T in	atf_c++_test \
+		build_test \
+		check_test \
+		config_test \
+		macros_test \
+		tests_test \
+		utils_test
+ATF_TESTS_CXX+=	${_T}
+SRCS_${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+ATF_TESTS_SH=	pkg_config_test
+
+# Tests in atf-c++/detail.
+
+.for _T in	application_test \
+		env_test \
+		exceptions_test \
+		expand_test \
+		fs_test \
+		parser_test \
+		process_test \
+		sanity_test \
+		text_test \
+		ui_test
+ATF_TESTS_CXX+=	${_T}
+SRCS_${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+.include <atf.test.mk>
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 26fba5c35c83..b197958c3278 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -30,6 +30,7 @@
 LIB=		atf-c
 SHLIB_MAJOR=	1
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
@@ -73,4 +74,8 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
 
 MAN=		atf-c-api.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR=		tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/atf/libatf-c/Makefile.inc b/lib/atf/libatf-c/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/lib/atf/libatf-c/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
new file mode 100644
index 000000000000..db04f1fa793f
--- /dev/null
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -0,0 +1,62 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-c
+.PATH:		${ATF}/atf-c/detail
+
+CFLAGS+=	-I${ATF}
+
+.if ${COMPILER_TYPE} == "clang"
+# macros_test.c contains a double 'const const' which will be gone with
+# the import of atf-0.18.
+# TODO(jmmv): Remove this workaround once we do that update.
+CFLAGS+=	-Wno-duplicate-decl-specifier
+.endif
+
+FILESDIR=	${TESTSDIR}
+FILES=		macros_h_test.c
+FILES+=		unused_test.c
+
+# Tests in atf-c.
+
+.for _T in	atf_c_test \
+		build_test \
+		check_test \
+		config_test \
+		error_test \
+		macros_test \
+		tc_test \
+		tp_test \
+		utils_test
+ATF_TESTS_C+=	${_T}
+SRCS_${_T}=	${_T}.c test_helpers.c
+.endfor
+
+ATF_TESTS_SH=	pkg_config_test
+
+# Tests in atf-c/detail.
+
+.for _T in	dynstr_test \
+		env_test \
+		fs_test \
+		list_test \
+		map_test \
+		process_test \
+		sanity_test \
+		test_helpers_test \
+		text_test \
+		user_test
+ATF_TESTS_C+=	${_T}
+SRCS_${_T}=	${_T}.c test_helpers.c
+.endfor
+
+PROGS+=		process_helpers
+SRCS_process_helpers=	process_helpers.c
+MAN_process_helpers=	# defined
+BINDIR_process_helpers=	${TESTSDIR}
+
+.include <atf.test.mk>
diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile
new file mode 100644
index 000000000000..7bc96c94b039
--- /dev/null
+++ b/lib/atf/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+SUBDIR=		test-programs
+
+.include <bsd.test.mk>
diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile
new file mode 100644
index 000000000000..cbbe7b317b86
--- /dev/null
+++ b/lib/atf/tests/test-programs/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/test-programs
+KYUAFILE=	yes
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/test-programs
+
+CFLAGS+=	-I${ATF}
+
+ATF_TESTS_C=		c_helpers
+
+ATF_TESTS_CXX=		cpp_helpers
+SRCS_cpp_helpers=	cpp_helpers.cpp
+
+ATF_TESTS_SH=		sh_helpers
+.for _T in config_test expect_test fork_test meta_data_test result_test srcdir_test
+ATF_TESTS_SH+=		${_T}
+ATF_TESTS_SH_SRC_${_T}=	common.sh ${_T}.sh
+.endfor
+
+.include <atf.test.mk>
diff --git a/libexec/Makefile b/libexec/Makefile
index 576335f2d2fd..cf5c12016c04 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -28,6 +28,7 @@ SUBDIR=	${_atf} \
 	talkd \
 	tcpd \
 	${_telnetd} \
+	${_tests} \
 	tftpd \
 	${_tftp-proxy} \
 	ulog-helper \
@@ -74,6 +75,7 @@ _telnetd=	telnetd
 
 .if ${MK_TESTS} != "no"
 _atf=		atf
+_tests=		tests
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/libexec/atf/Makefile b/libexec/atf/Makefile
index dc222c393329..6749db5fce9f 100644
--- a/libexec/atf/Makefile
+++ b/libexec/atf/Makefile
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check
+SUBDIR=	atf-check tests
 
 .include <bsd.subdir.mk>
diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
index a28f54645572..392bbb23b236 100644
--- a/libexec/atf/Makefile.inc
+++ b/libexec/atf/Makefile.inc
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-ATF = ${.CURDIR}/../../../contrib/atf
-
 CFLAGS+=	-DHAVE_CONFIG_H
 
 WARNS?=		3
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
index fafb1e40d653..0cfa8636491b 100644
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -27,6 +27,7 @@
 
 .include <bsd.init.mk>
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 BINDIR=		/usr/libexec
@@ -42,4 +43,8 @@ LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c++
 LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
 LDADD+=		-latf-c++ -latf-c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/libexec/atf/atf-check/Makefile.inc b/libexec/atf/atf-check/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/libexec/atf/atf-check/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile
new file mode 100644
index 000000000000..0f237e6d3f78
--- /dev/null
+++ b/libexec/atf/atf-check/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec/atf/atf-check
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-sh
+
+ATF_TESTS_SH=	atf-check_test
+
+.include <atf.test.mk>
diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile
new file mode 100644
index 000000000000..7aa96019367e
--- /dev/null
+++ b/libexec/atf/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec/atf
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile
new file mode 100644
index 000000000000..665efab4275e
--- /dev/null
+++ b/libexec/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index cbee3fb2b056..0a6145bc6d49 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -160,6 +160,7 @@ SUBDIR=	alias \
 	tar \
 	tcopy \
 	tee \
+	${_tests} \
 	tftp \
 	time \
 	tip \
@@ -330,6 +331,7 @@ SUBDIR+=	telnet
 
 .if ${MK_TESTS} != "no"
 _atf=		atf
+_tests=		tests
 .endif
 
 .if ${MK_TEXTPROC} != "no"
diff --git a/usr.bin/atf/Makefile b/usr.bin/atf/Makefile
index 0ea47aa05e58..054cdf2ac211 100644
--- a/usr.bin/atf/Makefile
+++ b/usr.bin/atf/Makefile
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-sh
+SUBDIR=	atf-sh tests
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/atf/Makefile.inc b/usr.bin/atf/Makefile.inc
index 6572cfed6826..a79cd6defdcc 100644
--- a/usr.bin/atf/Makefile.inc
+++ b/usr.bin/atf/Makefile.inc
@@ -1,6 +1,4 @@
 # $FreeBSD$
 
-ATF=		${.CURDIR}/../../../contrib/atf
-
 BINDIR?=	/usr/bin
 WARNS?=		3
diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
index 81120984316d..1688b191f5cf 100644
--- a/usr.bin/atf/atf-sh/Makefile
+++ b/usr.bin/atf/atf-sh/Makefile
@@ -27,6 +27,7 @@
 
 .include <bsd.init.mk>
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 PROG_CXX=	atf-sh
@@ -44,4 +45,8 @@ FILESGROUPS=	SUBR
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/atf/atf-sh/tests/Makefile b/usr.bin/atf/atf-sh/tests/Makefile
new file mode 100644
index 000000000000..664f25ab645f
--- /dev/null
+++ b/usr.bin/atf/atf-sh/tests/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/atf/atf-sh
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-sh
+
+ATF_TESTS_SH+=	atf_check_test
+ATF_TESTS_SH+=	config_test
+ATF_TESTS_SH+=	integration_test
+ATF_TESTS_SH+=	misc_helpers
+ATF_TESTS_SH+=	normalize_test
+ATF_TESTS_SH+=	tc_test
+ATF_TESTS_SH+=	tp_test
+
+.include <atf.test.mk>
diff --git a/usr.bin/atf/tests/Makefile b/usr.bin/atf/tests/Makefile
new file mode 100644
index 000000000000..3ff9f93f2dec
--- /dev/null
+++ b/usr.bin/atf/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/atf
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile
new file mode 100644
index 000000000000..f8ead8890f2c
--- /dev/null
+++ b/usr.bin/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>