Date: Fri, 8 Nov 2013 14:24:47 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257850 - in head: . lib libexec share/doc share/man/man1 share/man/man4 share/mk tools/build/mk usr.bin Message-ID: <201311081424.rA8EOlnr014128@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Fri Nov 8 14:24:47 2013 New Revision: 257850 URL: http://svnweb.freebsd.org/changeset/base/257850 Log: Subsume the functionality of MK_ATF into MK_TESTS. There is no reason to keep the two knobs separate: if tests are enabled, the ATF libraries are required; and if tests are disabled, the ATF libraries are not necessary. Keeping the two just serves to complicate the build. Reviewed by: freebsd-testing Approved by: rpaulo (mentor) Modified: head/Makefile.inc1 head/UPDATING head/lib/Makefile head/libexec/Makefile head/share/doc/Makefile head/share/man/man1/Makefile head/share/man/man4/Makefile head/share/mk/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Nov 8 14:22:16 2013 (r257849) +++ head/Makefile.inc1 Fri Nov 8 14:24:47 2013 (r257850) @@ -1492,7 +1492,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= lib/atf .endif Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Nov 8 14:22:16 2013 (r257849) +++ head/UPDATING Fri Nov 8 14:24:47 2013 (r257850) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131108: + The WITHOUT_ATF build knob has been removed and its functionality + has been subsumed into the more generic WITHOUT_TESTS. If you were + using the former to disable the build of the ATF libraries, you + should change your settings to use the latter. + 20131025: The default version of mtree is nmtree which is obtained from NetBSD. The output is generally the same, but may vary Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/lib/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -140,10 +140,6 @@ _csu=csu # NB: keep these sorted by MK_* knobs -.if ${MK_ATF} != "no" -_atf= atf -.endif - .if ${MK_ATM} != "no" _libngatm= libngatm .endif @@ -253,6 +249,10 @@ _libsmutil= libsmutil _libtelnet= libtelnet .endif +.if ${MK_TESTS} != "no" +_atf= atf +.endif + .if ${MK_UNBOUND} != "no" _libunbound= libunbound .endif Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/libexec/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -33,10 +33,6 @@ SUBDIR= ${_atf} \ ulog-helper \ ${_ypxfr} -.if ${MK_ATF} != "no" -_atf= atf -.endif - .if ${MK_AT} != "no" _atrun= atrun .endif @@ -76,4 +72,8 @@ _smrsh= smrsh _telnetd= telnetd .endif +.if ${MK_TESTS} != "no" +_atf= atf +.endif + .include <bsd.subdir.mk> Modified: head/share/doc/Makefile ============================================================================== --- head/share/doc/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/share/doc/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -9,7 +9,7 @@ SUBDIR= ${_IPv6} \ ${_llvm} \ ${_roffdocs} -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" _atf= atf .endif Modified: head/share/man/man1/Makefile ============================================================================== --- head/share/man/man1/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/share/man/man1/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -5,7 +5,7 @@ MAN= builtin.1 intro.1 -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc MAN+= atf-test-program.1 Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/share/man/man4/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -829,7 +829,7 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc _atf_test_case.4= atf-test-case.4 Modified: head/share/mk/Makefile ============================================================================== --- head/share/mk/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/share/mk/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -43,7 +43,7 @@ FILES= \ NO_OBJ= FILESDIR= ${BINDIR}/mk -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" FILES+= atf.test.mk .endif Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 8 14:22:16 2013 (r257849) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 8 14:24:47 2013 (r257850) @@ -68,54 +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.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 -.endif - .if ${MK_ATM} == no OLD_FILES+=rescue/atmconfig OLD_FILES+=sbin/atmconfig @@ -4104,6 +4056,58 @@ OLD_FILES+=usr/share/man/man1/telnet.1.g 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. +# TODO(jmmv): To be filled in. +.endif + #.if ${MK_TOOLCHAIN} == no # to be filled in #.endif Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Fri Nov 8 14:22:16 2013 (r257849) +++ head/usr.bin/Makefile Fri Nov 8 14:24:47 2013 (r257850) @@ -210,10 +210,6 @@ SUBDIR= alias \ SUBDIR+= at .endif -.if ${MK_ATF} != "no" -_atf= atf -.endif - .if ${MK_ATM} != "no" SUBDIR+= atm .endif @@ -332,6 +328,10 @@ SUBDIR+= vacation SUBDIR+= telnet .endif +.if ${MK_TESTS} != "no" +_atf= atf +.endif + .if ${MK_TEXTPROC} != "no" SUBDIR+= checknr SUBDIR+= colcrt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311081424.rA8EOlnr014128>