d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Subsume the functionality of MK_ATF into MK_TESTS.

Browse Source 
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)
This commit is contained in:
Julio Merino 2013-11-08 14:24:47 +00:00
parent ee695f67a6
commit e01d128a42
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=257850
10 changed files with 75 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -1492,7 +1492,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl} ${_secure_lib_libssh} ${_secure_lib_libssl}
.if ${MK_ATF} != "no" .if ${MK_TESTS} != "no"
_lib_atf= lib/atf _lib_atf= lib/atf
.endif .endif

6
UPDATING
View File

@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
disable the most expensive debugging functionality run disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".) "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: 20131025:
The default version of mtree is nmtree which is obtained from The default version of mtree is nmtree which is obtained from
NetBSD. The output is generally the same, but may vary NetBSD. The output is generally the same, but may vary

8
lib/Makefile
View File

@ -140,10 +140,6 @@ _csu=csu
# NB: keep these sorted by MK_* knobs # NB: keep these sorted by MK_* knobs
.if ${MK_ATF} != "no"
_atf= atf
.endif
.if ${MK_ATM} != "no" .if ${MK_ATM} != "no"
_libngatm= libngatm _libngatm= libngatm
.endif .endif
@ -253,6 +249,10 @@ _libsmutil= libsmutil
_libtelnet= libtelnet _libtelnet= libtelnet
.endif .endif
.if ${MK_TESTS} != "no"
_atf= atf
.endif
.if ${MK_UNBOUND} != "no" .if ${MK_UNBOUND} != "no"
_libunbound= libunbound _libunbound= libunbound
.endif .endif

8
libexec/Makefile
View File

@ -33,10 +33,6 @@ SUBDIR= ${_atf} \
ulog-helper \ ulog-helper \
${_ypxfr} ${_ypxfr}
.if ${MK_ATF} != "no"
_atf= atf
.endif
.if ${MK_AT} != "no" .if ${MK_AT} != "no"
_atrun= atrun _atrun= atrun
.endif .endif
@ -76,4 +72,8 @@ _smrsh= smrsh
_telnetd= telnetd _telnetd= telnetd
.endif .endif
.if ${MK_TESTS} != "no"
_atf= atf
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

2
share/doc/Makefile
View File

@ -9,7 +9,7 @@ SUBDIR= ${_IPv6} \
${_llvm} \ ${_llvm} \
${_roffdocs} ${_roffdocs}
.if ${MK_ATF} != "no" .if ${MK_TESTS} != "no"
_atf= atf _atf= atf
.endif .endif

2
share/man/man1/Makefile
View File

@ -5,7 +5,7 @@
MAN= builtin.1 intro.1 MAN= builtin.1 intro.1
.if ${MK_ATF} != "no" .if ${MK_TESTS} != "no"
ATF= ${.CURDIR}/../../../contrib/atf ATF= ${.CURDIR}/../../../contrib/atf
.PATH: ${ATF}/doc .PATH: ${ATF}/doc
MAN+= atf-test-program.1 MAN+= atf-test-program.1

2
share/man/man4/Makefile
View File

@ -829,7 +829,7 @@ _nvram2env.4= nvram2env.4
SUBDIR= man4.${MACHINE_CPUARCH} SUBDIR= man4.${MACHINE_CPUARCH}
.endif .endif
.if ${MK_ATF} != "no" .if ${MK_TESTS} != "no"
ATF= ${.CURDIR}/../../../contrib/atf ATF= ${.CURDIR}/../../../contrib/atf
.PATH: ${ATF}/doc .PATH: ${ATF}/doc
_atf_test_case.4= atf-test-case.4 _atf_test_case.4= atf-test-case.4

2
share/mk/Makefile
View File

@ -43,7 +43,7 @@ FILES= \
NO_OBJ= NO_OBJ=
FILESDIR= ${BINDIR}/mk FILESDIR= ${BINDIR}/mk
.if ${MK_ATF} != "no" .if ${MK_TESTS} != "no"
FILES+= atf.test.mk FILES+= atf.test.mk
.endif .endif

100
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -68,54 +68,6 @@ OLD_FILES+=usr/share/man/man1/batch.1.gz
OLD_FILES+=usr/share/man/man8/atrun.8.gz OLD_FILES+=usr/share/man/man8/atrun.8.gz
.endif .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 .if ${MK_ATM} == no
OLD_FILES+=rescue/atmconfig OLD_FILES+=rescue/atmconfig
OLD_FILES+=sbin/atmconfig OLD_FILES+=sbin/atmconfig
@ -4104,6 +4056,58 @@ OLD_FILES+=usr/share/man/man1/telnet.1.gz
OLD_FILES+=usr/share/man/man8/telnetd.8.gz OLD_FILES+=usr/share/man/man8/telnetd.8.gz
.endif .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 #.if ${MK_TOOLCHAIN} == no
# to be filled in # to be filled in
#.endif #.endif

8
usr.bin/Makefile
View File

@ -210,10 +210,6 @@ SUBDIR= alias \
SUBDIR+= at SUBDIR+= at
.endif .endif
.if ${MK_ATF} != "no"
_atf= atf
.endif
.if ${MK_ATM} != "no" .if ${MK_ATM} != "no"
SUBDIR+= atm SUBDIR+= atm
.endif .endif
@ -332,6 +328,10 @@ SUBDIR+= vacation
SUBDIR+= telnet SUBDIR+= telnet
.endif .endif
.if ${MK_TESTS} != "no"
_atf= atf
.endif
.if ${MK_TEXTPROC} != "no" .if ${MK_TEXTPROC} != "no"
SUBDIR+= checknr SUBDIR+= checknr
SUBDIR+= colcrt SUBDIR+= colcrt