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 /tools/build | |
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 'tools/build')
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 105 | ||||
-rw-r--r-- | tools/build/options/WITHOUT_TESTS | 2 |
2 files changed, 57 insertions, 50 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 82d83733..c9e1c02 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -68,56 +68,6 @@ OLD_FILES+=usr/share/man/man1/batch.1.gz OLD_FILES+=usr/share/man/man8/atrun.8.gz .endif -.if ${MK_ATF} == no -OLD_FILES+=usr/bin/atf-sh -OLD_DIRS+=usr/include/atf-c -OLD_FILES+=usr/include/atf-c/build.h -OLD_FILES+=usr/include/atf-c/check.h -OLD_FILES+=usr/include/atf-c/config.h -OLD_FILES+=usr/include/atf-c/defs.h -OLD_FILES+=usr/include/atf-c/error.h -OLD_FILES+=usr/include/atf-c/error_fwd.h -OLD_FILES+=usr/include/atf-c/macros.h -OLD_FILES+=usr/include/atf-c/tc.h -OLD_FILES+=usr/include/atf-c/tp.h -OLD_FILES+=usr/include/atf-c/utils.h -OLD_FILES+=usr/include/atf-c/atf-c.h -OLD_FILES+=usr/include/atf-c.h -OLD_DIRS+=usr/include/atf-c++ -OLD_FILES+=usr/include/atf-c++/build.hpp -OLD_FILES+=usr/include/atf-c++/check.hpp -OLD_FILES+=usr/include/atf-c++/config.hpp -OLD_FILES+=usr/include/atf-c++/macros.hpp -OLD_FILES+=usr/include/atf-c++/tests.hpp -OLD_FILES+=usr/include/atf-c++/utils.hpp -OLD_FILES+=usr/include/atf-c++/atf-c++.hpp -OLD_FILES+=usr/include/atf-c++.hpp -OLD_FILES+=usr/lib/libatf-c_p.a -OLD_FILES+=usr/lib/libatf-c.so.1 -OLD_FILES+=usr/lib/libatf-c.so -OLD_FILES+=usr/lib/libatf-c++.a -OLD_FILES+=usr/lib/libatf-c++_p.a -OLD_FILES+=usr/lib/libatf-c++.so.1 -OLD_FILES+=usr/lib/libatf-c++.so -OLD_FILES+=usr/lib/libatf-c.a -OLD_FILES+=usr/libexec/atf-check -OLD_DIRS+=usr/share/atf -OLD_FILES+=usr/share/atf/libatf-sh.subr -OLD_DIRS+=usr/share/doc/atf -OLD_FILES+=usr/share/doc/atf/AUTHORS -OLD_FILES+=usr/share/doc/atf/COPYING -OLD_FILES+=usr/share/doc/atf/NEWS -OLD_FILES+=usr/share/doc/atf/README -OLD_FILES+=usr/share/man/man1/atf-check.1.gz -OLD_FILES+=usr/share/man/man1/atf-sh.1.gz -OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz -OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz -OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz -OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz -OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz -OLD_FILES+=usr/share/mk/atf.test.mk -.endif - .if ${MK_ATM} == no OLD_FILES+=rescue/atmconfig OLD_FILES+=sbin/atmconfig @@ -4141,6 +4091,61 @@ OLD_FILES+=usr/share/man/man1/telnet.1.gz OLD_FILES+=usr/share/man/man8/telnetd.8.gz .endif +.if ${MK_TESTS} == no +# ATF libraries. +OLD_FILES+=usr/bin/atf-sh +OLD_DIRS+=usr/include/atf-c +OLD_FILES+=usr/include/atf-c/build.h +OLD_FILES+=usr/include/atf-c/check.h +OLD_FILES+=usr/include/atf-c/config.h +OLD_FILES+=usr/include/atf-c/defs.h +OLD_FILES+=usr/include/atf-c/error.h +OLD_FILES+=usr/include/atf-c/error_fwd.h +OLD_FILES+=usr/include/atf-c/macros.h +OLD_FILES+=usr/include/atf-c/tc.h +OLD_FILES+=usr/include/atf-c/tp.h +OLD_FILES+=usr/include/atf-c/utils.h +OLD_FILES+=usr/include/atf-c.h +OLD_DIRS+=usr/include/atf-c++ +OLD_FILES+=usr/include/atf-c++/build.hpp +OLD_FILES+=usr/include/atf-c++/check.hpp +OLD_FILES+=usr/include/atf-c++/config.hpp +OLD_FILES+=usr/include/atf-c++/macros.hpp +OLD_FILES+=usr/include/atf-c++/tests.hpp +OLD_FILES+=usr/include/atf-c++/utils.hpp +OLD_FILES+=usr/include/atf-c++.hpp +OLD_FILES+=usr/lib/libatf-c_p.a +OLD_FILES+=usr/lib/libatf-c.so.1 +OLD_FILES+=usr/lib/libatf-c.so +OLD_FILES+=usr/lib/libatf-c++.a +OLD_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c++.so.1 +OLD_FILES+=usr/lib/libatf-c++.so +OLD_FILES+=usr/lib/libatf-c.a +OLD_FILES+=usr/libexec/atf-check +OLD_DIRS+=usr/share/atf +OLD_FILES+=usr/share/atf/libatf-sh.subr +OLD_DIRS+=usr/share/doc/atf +OLD_FILES+=usr/share/doc/atf/AUTHORS +OLD_FILES+=usr/share/doc/atf/COPYING +OLD_FILES+=usr/share/doc/atf/NEWS +OLD_FILES+=usr/share/doc/atf/README +OLD_FILES+=usr/share/man/man1/atf-check.1.gz +OLD_FILES+=usr/share/man/man1/atf-sh.1.gz +OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz +OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz +OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz +OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz +OLD_FILES+=usr/share/mk/atf.test.mk + +# Test suite. +TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,' +OLD_DIRS+=${TESTS_DIRS} +TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,' +OLD_FILES+=${TESTS_FILES} +.endif + #.if ${MK_TOOLCHAIN} == no # to be filled in #.endif diff --git a/tools/build/options/WITHOUT_TESTS b/tools/build/options/WITHOUT_TESTS new file mode 100644 index 0000000..05aeeb8 --- /dev/null +++ b/tools/build/options/WITHOUT_TESTS @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build any test programs nor install them in /usr/tests. |