diff options
author | Julio Merino <jmmv@FreeBSD.org> | 2014-06-10 17:04:30 +0000 |
---|---|---|
committer | Julio Merino <jmmv@FreeBSD.org> | 2014-06-10 17:04:30 +0000 |
commit | e8a34402f296b676f3ebdcb49a40b9ad9ea2bfa9 (patch) | |
tree | 14219a1465e8bb9a0c64910c555829e62c34c481 /Makefile.inc1 | |
parent | 404874659fd4022929e587ef848879fa301b174d (diff) | |
download | src-e8a34402f296b676f3ebdcb49a40b9ad9ea2bfa9.tar.gz src-e8a34402f296b676f3ebdcb49a40b9ad9ea2bfa9.zip |
Put the test suite in its own tests.txz distribution file.
Force all the contents of /usr/tests to go into a separate distribution
file so that users of binary releases can easily choose to not install it.
To make this possible, we need two fixes:
- bsd.subdir.mk needs to properly honor NO_SUBDIR in all cases so that we
do not recurse into 'tests' subdirectories when we needn't. Otherwise,
we end up with some Kyuafiles in base.txz.
- etc/Makefile needs to skip installing tests in its 'distribute' target
so that a Kyuafile doesn't leak into base.txz.
Approved by: gjb
Notes
Notes:
svn path=/head/; revision=267331
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c9f41e1491bc..344da994ef32 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -776,6 +776,9 @@ EXTRA_DISTRIBUTIONS+= games .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif +.if ${MK_TESTS} != "no" +EXTRA_DISTRIBUTIONS+= tests +.endif MTREE_MAGIC?= mtree 2.0 @@ -817,6 +820,10 @@ distributeworld installworld: _installcheck_world mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null .endif +.if ${MK_TESTS} != "no" && ${dist} == "tests" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null +.endif .if defined(NO_ROOT) ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ sed -e 's#^\./#./${dist}/#' >> ${METALOG} |