Author: jmmv
Date: Tue Jun 10 17:04:30 2014
New Revision: 267331
URL: http://svnweb.freebsd.org/changeset/base/267331
Log:
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
Modified:
head/Makefile.inc1
head/etc/Makefile
head/share/mk/bsd.subdir.mk
head/share/mk/bsd.test.mk
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Jun 10 16:45:58 2014 (r267330)
+++ head/Makefile.inc1 Tue Jun 10 17:04:30 2014 (r267331)
@@ -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: _installch
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}
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Tue Jun 10 16:45:58 2014 (r267330)
+++ head/etc/Makefile Tue Jun 10 17:04:30 2014 (r267331)
@@ -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>
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Tue Jun 10 16:45:58 2014 (r267330)
+++ head/share/mk/bsd.subdir.mk Tue Jun 10 17:04:30 2014 (r267331)
@@ -81,6 +81,7 @@ __subdir_targets+= .WAIT
.else
__subdir_targets+= ${__target}_subdir_${__dir}
${__target}_subdir_${__dir}: .MAKE
+.if !defined(NO_SUBDIR)
@${_+_}set -e; \
if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH}
(${__target:realinstall=install})"; \
@@ -94,6 +95,7 @@ ${__target}_subdir_${__dir}: .MAKE
${MAKE} ${__target:realinstall=install} \
DIRPRFX=${DIRPRFX}$$edir/
.endif
+.endif
.endfor
${__target}: ${__subdir_targets}
.else
Modified: head/share/mk/bsd.test.mk
==============================================================================
--- head/share/mk/bsd.test.mk Tue Jun 10 16:45:58 2014 (r267330)
+++ head/share/mk/bsd.test.mk Tue Jun 10 17:04:30 2014 (r267331)
@@ -27,6 +27,15 @@ TESTS_SUBDIRS?=
# List of variables to pass to the tests at run-time via the environment.
TESTS_ENV?=
+# Force all tests in a separate distribution file.
+#
+# We want this to be the case even when the distribution name is already
+# overriden. For example: we want the tests for programs in the 'games'
+# distribution to end up in the 'tests' distribution; the test programs
+# themselves have all the necessary logic to detect that the games are not
+# installed and thus won't cause false negatives.
+DISTRIBUTION:= tests
+
# Ordered list of directories to construct the PATH for the tests.
TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \
${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
