diff options
| author | jmmv <jmmv@FreeBSD.org> | 2013-12-28 20:05:31 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2013-12-28 20:05:31 +0000 |
| commit | b8ce141a401c502407ab3e076ccfc3b428c8ac61 (patch) | |
| tree | 1e4c4b26bd2c60765979478d61b32a6f4f36cab8 /share/mk | |
| parent | 4eef328225427f2fe373947481338f803da1c0fc (diff) | |
| download | FreeBSD-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 'share/mk')
| -rw-r--r-- | share/mk/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile index d07402b..c776134 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -43,7 +43,7 @@ FILES= \ NO_OBJ= FILESDIR= ${BINDIR}/mk -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" FILES+= atf.test.mk FILES+= plain.test.mk FILES+= tap.test.mk diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 972a526..c292d6e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -376,6 +376,7 @@ __DEFAULT_NO_OPTIONS = \ PKGTOOLS \ SHARED_TOOLCHAIN \ SVN \ + TESTS \ USB_GADGET_EXAMPLES # @@ -555,6 +556,20 @@ MK_CLANG_FULL:= no MK_LLDB:= no .endif +.if defined(NO_TESTS) +# This should be handled above along the handling of all other NO_* options. +# However, the above is broken when WITH_*=yes are passed to make(1) as +# command line arguments. See PR bin/183762. +# +# Because the TESTS option is new and it will default to yes, it's likely +# that people will pass WITHOUT_TESTS=yes to make(1) directly and get a broken +# build. So, just in case, it's better to explicitly handle this case here. +# +# TODO(jmmv): Either fix make to allow us putting this override where it +# belongs above or fix this file to cope with the make bug. +MK_TESTS:= no +.endif + # # Set defaults for the MK_*_SUPPORT variables. # |
