Permalink
Browse files

MFC 256365

	 Remove most of the ATF tools and the _atf user.

Approved by:	re
  • Loading branch information...
1 parent 89a272e commit 33f3e6ab569eb1040266c8ee7bdd0cf74bd58751 @rpaulo rpaulo committed Oct 12, 2013
View
@@ -38,6 +38,25 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131013: Removal of the ATF tools
+OLD_FILES+=etc/atf/FreeBSD.conf
+OLD_FILES+=etc/atf/atf-run.hooks
+OLD_FILES+=etc/atf/common.conf
+OLD_FILES+=usr/bin/atf-config
+OLD_FILES+=usr/bin/atf-report
+OLD_FILES+=usr/bin/atf-run
+OLD_FILES+=usr/bin/atf-version
+OLD_FILES+=usr/share/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/tests-results.css
+OLD_FILES+=usr/share/man/man1/atf-config.1.gz
+OLD_FILES+=usr/share/man/man1/atf-report.1.gz
+OLD_FILES+=usr/share/man/man1/atf-run.1.gz
+OLD_FILES+=usr/share/man/man1/atf-version.1.gz
+OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
+OLD_FILES+=usr/share/man/man7/atf.7.gz
+OLD_FILES+=usr/share/xml/atf/tests-results.dtd
+OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
# 20131009: freebsd-version moved from /libexec to /bin
OLD_FILES+=libexec/freebsd-version
# 20131001: ar and ranlib from binutils not used
@@ -6093,6 +6112,13 @@ OLD_LIBS+=usr/lib/libkse.so.1
OLD_LIBS+=usr/lib/liblwres.so.3
OLD_LIBS+=usr/lib/pam_ftp.so.2
+# 20131013: Removal of the ATF tools
+OLD_DIRS+=etc/atf
+OLD_DIRS+=usr/share/examples/atf
+OLD_DIRS+=usr/share/xml/atf
+OLD_DIRS+=usr/share/xml
+OLD_DIRS+=usr/share/xsl/atf
+OLD_DIRS+=usr/share/xsl
# 20040925: bind9 import
OLD_DIRS+=usr/share/doc/bind/html
OLD_DIRS+=usr/share/doc/bind/misc
View
@@ -215,9 +215,6 @@ distribution:
echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
) | ${METALOG.add}
.endif
-.if ${MK_ATF} != "no"
- ${_+_}cd ${.CURDIR}/atf; ${MAKE} install
-.endif
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
View
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-# $FreeBSD$
-#
-# Configuration file for the FreeBSD test suite.
-#
-# See atf-formats(5) for details on the syntax of this file and tests(7) for
-# details on the FreeBSD test suite.
-#
-
-#variable1 = value1
-#variable2 = value2
View
@@ -1,39 +0,0 @@
-#-
-# Copyright (c) 2011 Google, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-ATF= ${.CURDIR}/../../contrib/atf
-
-.PATH: ${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESGROUPS= ETC
-
-ETCDIR= /etc/atf
-ETC= FreeBSD.conf atf-run.hooks common.conf
-
-.include <bsd.prog.mk>
View
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-# $FreeBSD$
-#
-# Sample configuration file for properties affecting all test suites.
-#
-
-# When running the test suite as root, some tests require to switch to
-# an unprivileged user to perform extra checks. Set this variable to
-# the user you want to use in those cases. If not set, those tests will
-# be skipped.
-unprivileged-user = "_atf"
View
@@ -15,7 +15,6 @@ man
sshd
smmsp
mailnull
-_atf
bind
unbound
proxy
View
@@ -16,7 +16,6 @@ staff:*:20:
sshd:*:22:
smmsp:*:25:
mailnull:*:26:
-_atf:*:27:
guest:*:31:
bind:*:53:
unbound:*:59:
View
@@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
-_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
View
@@ -24,8 +24,6 @@
etc
X11
..
- atf
- ..
bluetooth
..
defaults
View
@@ -299,8 +299,6 @@
..
IPv6
..
- atf
- ..
bhyve
..
bootforth
@@ -1410,14 +1408,6 @@
catalog
..
..
- xml
- atf
- ..
- ..
- xsl
- atf
- ..
- ..
zoneinfo
Africa
..
@@ -43,7 +43,7 @@ ATF_TC_BODY(invalid, tc)
/*
* This function must not do anything except enumerate
- * the test cases, else atf-run is likely to be upset.
+ * the test cases, per atf-c-api(3).
*/
ATF_TP_ADD_TCS(tp)
{
View
@@ -5,8 +5,7 @@
# Do not include `info' in the SUBDIR list, it is handled separately.
-SUBDIR= ${_atf} \
- ${_colldef} \
+SUBDIR= ${_colldef} \
${_dict} \
${_doc} \
dtrace \
@@ -27,16 +26,10 @@ SUBDIR= ${_atf} \
tabset \
termcap \
${_timedef} \
- xml \
- xsl \
${_zoneinfo}
# NB: keep these sorted by MK_* knobs
-.if ${MK_ATF} != "no"
-_atf= atf
-.endif
-
.if ${MK_BSNMP} != "no"
_snmp= snmp
.endif
View
@@ -1,37 +0,0 @@
-#-
-# Copyright (c) 2012 EMC Corporation.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-ATF= ${.CURDIR}/../../contrib/atf
-
-.PATH: ${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESDIR= ${SHAREDIR}/atf
-FILES= atf-run.hooks
-
-.include <bsd.prog.mk>
View
@@ -241,9 +241,6 @@ etc-examples:
.if ${SHARED} != "symlinks"
SUBDIR= smbfs
-.if ${MK_ATF} != "no"
-SUBDIR+=atf
-.endif
.if ${MK_IPFILTER} != "no"
SUBDIR+=ipfilter
.endif
@@ -1,39 +0,0 @@
-#-
-# Copyright (c) 2011 Google, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-ATF= ${.CURDIR}/../../../contrib/atf
-
-.PATH: ${ATF}/atf-report
-.PATH: ${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESDIR= ${SHAREDIR}/examples/atf
-FILES= atf-run.hooks \
- tests-results.css
-
-.include <bsd.prog.mk>
View
@@ -6,7 +6,6 @@
#MISSING: dump.5 plot.5
MAN= acct.5 \
ar.5 \
- ${_atf_formats.5} \
a.out.5 \
bluetooth.device.conf.5 \
bluetooth.hosts.5 \
@@ -80,12 +79,6 @@ MLINKS+=quota.user.5 quota.group.5
MLINKS+=rc.conf.5 rc.conf.local.5
MLINKS+=resolver.5 resolv.conf.5
-.if ${MK_ATF} != "no"
-ATF= ${.CURDIR}/../../../contrib/atf
-.PATH: ${ATF}/doc
-_atf_formats.5= atf-formats.5
-.endif
-
.if ${MK_FREEBSD_UPDATE} != "no"
MAN+= freebsd-update.conf.5
.endif
View
@@ -36,17 +36,4 @@ MLINKS+= c99.7 c78.7
MLINKS+= c99.7 c89.7
MLINKS+= c99.7 c90.7
-.if ${MK_ATF} != "no"
-ATF= ${.CURDIR}/../../../contrib/atf
-.PATH: ${ATF}/doc
-MAN+= atf.7
-
-CLEANFILES+= atf.7 atf.7.tmp
-atf.7: atf.7.in
- sed -e 's,__DOCDIR__,${DOCDIR}/atf,g' \
- -e 's,__TESTSDIR__,${TESTSBASE},g' \
- < ${.ALLSRC} > ${.TARGET}.tmp
- mv ${.TARGET}.tmp ${.TARGET}
-.endif
-
.include <bsd.prog.mk>
Oops, something went wrong.

0 comments on commit 33f3e6a

Please sign in to comment.