diff options
| author | jmmv <jmmv@FreeBSD.org> | 2014-06-10 17:04:30 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2014-06-10 17:04:30 +0000 |
| commit | eaa2cac55821c825b2408c2685152668dd8e436a (patch) | |
| tree | 14219a1465e8bb9a0c64910c555829e62c34c481 /etc | |
| parent | e48c89801a60e658b6613418e437afee6c72cd98 (diff) | |
| download | FreeBSD-src-eaa2cac55821c825b2408c2685152668dd8e436a.zip FreeBSD-src-eaa2cac55821c825b2408c2685152668dd8e436a.tar.gz | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile index 8615046..4f1636b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -174,7 +174,10 @@ afterinstall: .endif distribute: - ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} + # Avoid installing tests here; "make distribution" will do this and + # correctly place them in the right location. + ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \ + DESTDIR=${DISTDIR}/${DISTRIBUTION} ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include <bsd.endian.mk> |
