aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorJulio Merino <jmmv@FreeBSD.org>2013-12-28 20:05:31 +0000
committerJulio Merino <jmmv@FreeBSD.org>2013-12-28 20:05:31 +0000
commit027e2b3cecc0dd0690e7413c99e278d5a04507a5 (patch)
tree1e4c4b26bd2c60765979478d61b32a6f4f36cab8 /libexec
parent8a0568656cc586801ef2891d6ca696d13d73ada1 (diff)
downloadsrc-027e2b3cecc0dd0690e7413c99e278d5a04507a5.tar.gz
src-027e2b3cecc0dd0690e7413c99e278d5a04507a5.zip
Set up the /usr/tests hierarchy.
This is a MFC of the following into stable/10: - r257097 Set up the /usr/tests hierarchy. - r257098 Add missing WITHOUTTESTS file. - r257100 Add a tests(7) manual page. - r257105 Disable WITHTESTS= for now. - r257848 Fix buildworld when WITHTESTS is enabled. - r257850 Subsume the functionality of MKATF into MKTESTS. - r257851 Handle the removal of the test suite when WITHOUTTESTS=yes. - r257852 Install category Kyuafiles from their category directories. - r258232 Install BSD.tests.mtree when MKTESTS is yes. Note that building with WITH_TESTS is still broken at this point (and hence why WITHOUT_TESTS is the set as the default). Subsequent pullups will fix the remaining issues.
Notes
Notes: svn path=/stable/10/; revision=260013
Diffstat (limited to 'libexec')
-rw-r--r--libexec/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/Makefile b/libexec/Makefile
index 0b9c9618a1b7..576335f2d2fd 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -33,10 +33,6 @@ SUBDIR= ${_atf} \
ulog-helper \
${_ypxfr}
-.if ${MK_ATF} != "no"
-_atf= atf
-.endif
-
.if ${MK_AT} != "no"
_atrun= atrun
.endif
@@ -76,4 +72,8 @@ _smrsh= smrsh
_telnetd= telnetd
.endif
+.if ${MK_TESTS} != "no"
+_atf= atf
+.endif
+
.include <bsd.subdir.mk>