summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
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 /Makefile.inc1
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 'Makefile.inc1')
-rw-r--r--Makefile.inc137
1 files changed, 24 insertions, 13 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6fd6835..13c676a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -85,6 +85,9 @@ SUBDIR+=secure
SUBDIR+=share
.endif
SUBDIR+=sys usr.bin usr.sbin
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
.if ${MK_OFED} != "no"
SUBDIR+=contrib/ofed
.endif
@@ -489,6 +492,10 @@ _worldtmp:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${WORLDTMP}/usr/lib >/dev/null
.endif
+.if ${MK_TESTS} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+ -p ${WORLDTMP}${TESTSBASE} >/dev/null
+.endif
.for _mtree in ${LOCAL_MTREE}
mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
.endfor
@@ -1487,7 +1494,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
_lib_atf_libatf_c= lib/atf/libatf-c
.endif
@@ -1597,10 +1604,12 @@ ${_lib}__PL: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} DIRPRFX=${_lib}/ obj && \
- ${MAKE} DIRPRFX=${_lib}/ depend && \
- ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
- ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+ ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ DIRPRFX=${_lib}/ all && \
+ ${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+ DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1609,10 +1618,10 @@ ${_lib}__L: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
- ${MAKE} DIRPRFX=${_lib}/ obj && \
- ${MAKE} DIRPRFX=${_lib}/ depend && \
- ${MAKE} DIRPRFX=${_lib}/ all && \
- ${MAKE} DIRPRFX=${_lib}/ install
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
+ ${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
.endif
.endfor
@@ -1622,10 +1631,12 @@ ${_lib}__L: .PHONY .MAKE
lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam && \
- ${MAKE} DIRPRFX=lib/libpam/ obj && \
- ${MAKE} DIRPRFX=lib/libpam/ depend && \
- ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
- ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ -D_NO_LIBPAM_SO_YET all && \
+ ${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+ -D_NO_LIBPAM_SO_YET install
_prereq_libs: ${_prereq_libs:S/$/__PL/}
_startup_libs: ${_startup_libs:S/$/__L/}
OpenPOWER on IntegriCloud