summaryrefslogtreecommitdiffstats
path: root/tools/build
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2013-12-29 02:57:10 +0000
committerjmmv <jmmv@FreeBSD.org>2013-12-29 02:57:10 +0000
commit2cc168fb9fc9be682ff4c984b6306ddfe22c033d (patch)
tree65f81fcb32677687d7156f496d0c2c2b05ab505c /tools/build
parent17b80845b0ba13495186831d3505af8c20eeb6ac (diff)
downloadFreeBSD-src-2cc168fb9fc9be682ff4c984b6306ddfe22c033d.zip
FreeBSD-src-2cc168fb9fc9be682ff4c984b6306ddfe22c033d.tar.gz
Update atf to 0.18 and remove the code of the deprecated tools.
This is a MFC into stable/10 of: - r258286 Update notes for imports of atf. - r258289 MFV: Import atf-0.18. - r258290 Drop all ATF tools code. This is "make tinderbox" clean as run on ref10-amd64 with the default WITHOUT_TESTS option. A "make buildworld" with WITH_TESTS set now works as well.
Diffstat (limited to 'tools/build')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c9e1c02..4a5aa3b 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4091,7 +4091,10 @@ OLD_FILES+=usr/share/man/man1/telnet.1.gz
OLD_FILES+=usr/share/man/man8/telnetd.8.gz
.endif
-.if ${MK_TESTS} == no
+.if ${MK_TESTS} == yes
+OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
+OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
+.else
# ATF libraries.
OLD_FILES+=usr/bin/atf-sh
OLD_DIRS+=usr/include/atf-c
OpenPOWER on IntegriCloud