summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2013-12-28 20:05:31 +0000
committerjmmv <jmmv@FreeBSD.org>2013-12-28 20:05:31 +0000
commitb8ce141a401c502407ab3e076ccfc3b428c8ac61 (patch)
tree1e4c4b26bd2c60765979478d61b32a6f4f36cab8 /etc
parent4eef328225427f2fe373947481338f803da1c0fc (diff)
downloadFreeBSD-src-b8ce141a401c502407ab3e076ccfc3b428c8ac61.zip
FreeBSD-src-b8ce141a401c502407ab3e076ccfc3b428c8ac61.tar.gz
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.
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile6
-rw-r--r--etc/mtree/BSD.tests.dist12
-rw-r--r--etc/mtree/Makefile4
3 files changed, 22 insertions, 0 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 0370b99..d763df6 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -139,6 +139,9 @@ BIN1+= regdomain.xml
BIN2= netstart pccard_ether rc.suspend rc.resume
MTREE= BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
+.if ${MK_TESTS} != "no"
+MTREE+= BSD.tests.dist
+.endif
.if ${MK_SENDMAIL} != "no"
MTREE+= BSD.sendmail.dist
.endif
@@ -317,6 +320,9 @@ MTREES+= mtree/BSD.debug.dist /usr/lib
.if ${MK_GROFF} != "no"
MTREES+= mtree/BSD.groff.dist /usr
.endif
+.if ${MK_TESTS} != "no"
+MTREES+= mtree/BSD.tests.dist ${TESTSBASE}
+.endif
.if ${MK_SENDMAIL} != "no"
MTREES+= mtree/BSD.sendmail.dist /
.endif
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
new file mode 100644
index 0000000..37f37e9
--- /dev/null
+++ b/etc/mtree/BSD.tests.dist
@@ -0,0 +1,12 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+ lib
+ libcrypt
+ ..
+ ..
+..
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 3228c6c..f24867b 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -6,6 +6,7 @@ FILES= ${_BSD.debug.dist} \
BSD.include.dist \
BSD.root.dist \
${_BSD.sendmail.dist} \
+ ${_BSD.tests.dist} \
BSD.usr.dist \
BSD.var.dist
@@ -18,6 +19,9 @@ _BSD.groff.dist= BSD.groff.dist
.if ${MK_SENDMAIL} != "no"
_BSD.sendmail.dist= BSD.sendmail.dist
.endif
+.if ${MK_TESTS} != "no"
+_BSD.tests.dist= BSD.tests.dist
+.endif
NO_OBJ=
FILESDIR= /etc/mtree
OpenPOWER on IntegriCloud