Date: Sat, 12 Oct 2013 01:01:55 -0700 From: hiren panchasara <hiren@FreeBSD.org> To: Rui Paulo <rpaulo@freebsd.org> Cc: svn-src-head <svn-src-head@freebsd.org>, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org> Subject: Re: svn commit: r256365 - in head: . etc etc/atf etc/mtree lib/libcrypt/tests share share/atf share/examples share/examples/atf share/man/man5 share/man/man7 share/mk share/xml share/xsl tools/build/mk... Message-ID: <CALCpEUF4sOqP6G6dUY2vs49O3_O6G9XvCfPiRrjxXJ6b6k1vEg@mail.gmail.com> In-Reply-To: <201310120606.r9C66slB096693@svn.freebsd.org> References: <201310120606.r9C66slB096693@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Oct 11, 2013 11:07 PM, "Rui Paulo" <rpaulo@freebsd.org> wrote: > > Author: rpaulo > Date: Sat Oct 12 06:06:53 2013 > New Revision: 256365 > URL: http://svnweb.freebsd.org/changeset/base/256365 > > Log: > Remove most of the ATF tools and the _atf user. > > This is necessary because ATF is deprecated and it will be replaced by Kyua. When are we planning to bring in Kyua? I may be missing something but why remove ATF before that? Cheers, Hiren > > Submitted by: jmmv@netbsd.org > Reviewed by: Garrett Cooper > Approved by: re > > Deleted: > head/etc/atf/ > head/share/atf/ > head/share/examples/atf/ > head/share/xml/ > head/share/xsl/ > head/usr.bin/atf/atf-config/ > head/usr.bin/atf/atf-report/ > head/usr.bin/atf/atf-run/ > head/usr.bin/atf/atf-version/ > Modified: > head/ObsoleteFiles.inc > head/etc/Makefile > head/etc/ftpusers > head/etc/group > head/etc/master.passwd > head/etc/mtree/BSD.root.dist > head/etc/mtree/BSD.usr.dist > head/lib/libcrypt/tests/crypt_tests.c > head/share/Makefile > head/share/examples/Makefile > head/share/man/man5/Makefile > head/share/man/man7/Makefile > head/share/mk/atf.test.mk > head/tools/build/mk/OptionalObsoleteFiles.inc > head/usr.bin/atf/Makefile > head/usr.bin/atf/Makefile.inc > > Modified: head/ObsoleteFiles.inc > ============================================================================== > --- head/ObsoleteFiles.inc Sat Oct 12 04:35:38 2013 (r256364) > +++ head/ObsoleteFiles.inc Sat Oct 12 06:06:53 2013 (r256365) > @@ -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 > > Modified: head/etc/Makefile > ============================================================================== > --- head/etc/Makefile Sat Oct 12 04:35:38 2013 (r256364) > +++ head/etc/Makefile Sat Oct 12 06:06:53 2013 (r256365) > @@ -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 > > Modified: head/etc/ftpusers > ============================================================================== > --- head/etc/ftpusers Sat Oct 12 04:35:38 2013 (r256364) > +++ head/etc/ftpusers Sat Oct 12 06:06:53 2013 (r256365) > @@ -15,7 +15,6 @@ man > sshd > smmsp > mailnull > -_atf > bind > unbound > proxy > > Modified: head/etc/group > ============================================================================== > --- head/etc/group Sat Oct 12 04:35:38 2013 (r256364) > +++ head/etc/group Sat Oct 12 06:06:53 2013 (r256365) > @@ -16,7 +16,6 @@ staff:*:20: > sshd:*:22: > smmsp:*:25: > mailnull:*:26: > -_atf:*:27: > guest:*:31: > bind:*:53: > unbound:*:59: > > Modified: head/etc/master.passwd > ============================================================================== > --- head/etc/master.passwd Sat Oct 12 04:35:38 2013 (r256364) > +++ head/etc/master.passwd Sat Oct 12 06:06:53 2013 (r256365) > @@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/sha > 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 > > Modified: head/etc/mtree/BSD.root.dist > ============================================================================== > --- head/etc/mtree/BSD.root.dist Sat Oct 12 04:35:38 2013 (r256364) > +++ head/etc/mtree/BSD.root.dist Sat Oct 12 06:06:53 2013 (r256365) > @@ -24,8 +24,6 @@ > etc > X11 > .. > - atf > - .. > bluetooth > .. > defaults > > Modified: head/etc/mtree/BSD.usr.dist > ============================================================================== > --- head/etc/mtree/BSD.usr.dist Sat Oct 12 04:35:38 2013 (r256364) > +++ head/etc/mtree/BSD.usr.dist Sat Oct 12 06:06:53 2013 (r256365) > @@ -299,8 +299,6 @@ > .. > IPv6 > .. > - atf > - .. > bhyve > .. > bootforth > @@ -1410,14 +1408,6 @@ > catalog > .. > .. > - xml > - atf > - .. > - .. > - xsl > - atf > - .. > - .. > zoneinfo > Africa > .. > > Modified: head/lib/libcrypt/tests/crypt_tests.c > ============================================================================== > --- head/lib/libcrypt/tests/crypt_tests.c Sat Oct 12 04:35:38 2013 (r256364) > +++ head/lib/libcrypt/tests/crypt_tests.c Sat Oct 12 06:06:53 2013 (r256365) > @@ -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) > { > > Modified: head/share/Makefile > ============================================================================== > --- head/share/Makefile Sat Oct 12 04:35:38 2013 (r256364) > +++ head/share/Makefile Sat Oct 12 06:06:53 2013 (r256365) > @@ -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 > > Modified: head/share/examples/Makefile > ============================================================================== > --- head/share/examples/Makefile Sat Oct 12 04:35:38 2013 (r256364) > +++ head/share/examples/Makefile Sat Oct 12 06:06:53 2013 (r256365) > @@ -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 > > Modified: head/share/man/man5/Makefile > ============================================================================== > --- head/share/man/man5/Makefile Sat Oct 12 04:35:38 2013 (r256364) > +++ head/share/man/man5/Makefile Sat Oct 12 06:06:53 2013 (r256365) > @@ -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 > > Modified: head/share/man/man7/Makefile > ============================================================================== > --- head/share/man/man7/Makefile Sat Oct 12 04:35:38 2013 (r256364) > +++ head/share/man/man7/Makefile Sat Oct 12 06:06:53 2013 (r256365) > @@ -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> > > Modified: head/share/mk/atf.test.mk > ============================================================================== > --- head/share/mk/atf.test.mk Sat Oct 12 04:35:38 2013 (r256364) > +++ head/share/mk/atf.test.mk Sat Oct 12 06:06:53 2013 (r256365) > @@ -51,98 +51,4 @@ ${_T}: ${TESTS_SH_SRC_${_T}} > .endfor > .endif > > -ATFFILE?= auto > - > -.if ${ATFFILE:tl} != "no" > -FILES+= Atffile > -FILESDIR_Atffile= ${TESTSDIR} > - > -.if ${ATFFILE:tl} == "auto" > -CLEANFILES+= Atffile Atffile.tmp > - > -Atffile: Makefile > - @{ echo 'Content-Type: application/X-atf-atffile; version="1"'; \ > - echo; \ > - echo '# Automatically generated by atf-test.mk.'; \ > - echo; \ > - echo 'prop: test-suite = "'`uname -o`'"'; \ > - echo; \ > - for tp in ${ATF_TESTS}; do \ > - echo "tp: $${tp}"; \ > - done; } >Atffile.tmp > - @mv Atffile.tmp Atffile > -.endif > -.endif > - > -# Generate support variables for atf-test. > -# > -# atf-test can only work for native builds, i.e. a build host of a particular > -# OS building a release for the same OS version and architecture. The target > -# runs ATF, which is on the build host, and the tests execute code built for > -# the target host. > -# > -# Due to the dependencies of the binaries built by the source tree and how they > -# are used by tests, it is highly possible for a execution of "make test" to > -# report bogus results unless the new binaries are put in place. > - > -# XXX (gcooper): Executing ATF from outside the source tree is improper; it > -# should be built as part of the OS toolchain build for the host OS and > -# executed from there. > -ATF_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin > -TESTS_ENV+= PATH=${ATF_PATH:ts:}:${PATH} > - > -ATF_BUILD_CC?= ${DESTDIR}/usr/bin/cc > -ATF_BUILD_CPP?= ${DESTDIR}/usr/bin/cpp > -ATF_BUILD_CXX?= ${DESTDIR}/usr/bin/c++ > -ATF_CONFDIR?= ${DESTDIR}/etc > -ATF_INCLUDEDIR?= ${DESTDIR}/usr/include > -ATF_LIBDIR?= ${DESTDIR}/usr/lib > -ATF_LIBEXECDIR?= ${DESTDIR}/usr/libexec > -ATF_PKGDATADIR?= ${DESTDIR}/usr/share/atf > -ATF_SHELL?= ${DESTDIR}/bin/sh > -LD_LIBRARY_PATH?= ${TESTS_LD_LIBRARY_PATH:tW:S/ /:/g} > - > -ATF_ENV_VARS= \ > - ATF_BUILD_CC \ > - ATF_BUILD_CPP \ > - ATF_BUILD_CXX \ > - ATF_CONFDIR \ > - ATF_INCLUDEDIR \ > - ATF_LIBDIR \ > - ATF_LIBEXECDIR \ > - ATF_PKGDATADIR \ > - ATF_SHELL \ > - > -.for v in ${ATF_ENV_VARS} > -.if !empty($v) > -TESTS_ENV+= $v=${$v} > -.endif > -.endfor > - > -_TESTS_FIFO= ${.OBJDIR}/atf-run.fifo > -_TESTS_LOG= ${.OBJDIR}/atf-run.log > -CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG} > - > -ATF_BIN?= ${DESTDIR}/usr/bin > -ATF_REPORT?= ${ATF_BIN}/atf-report > -ATF_RUN?= ${ATF_BIN}/atf-run > - > -.PHONY: realtest > -realtest: > -.if defined(TESTSDIR) > - @set -e; \ > - cd ${DESTDIR}${TESTSDIR}; \ > - rm -f ${_TESTS_FIFO}; \ > - mkfifo ${_TESTS_FIFO}; \ > - tee ${_TESTS_LOG} < ${_TESTS_FIFO} | ${TESTS_ENV} ${ATF_REPORT} & \ > - set +e; \ > - ${TESTS_ENV} ${ATF_RUN} >> ${_TESTS_FIFO}; \ > - result=$${?}; \ > - wait; \ > - rm -f ${_TESTS_FIFO}; \ > - echo; \ > - echo "*** The verbatim output of atf-run has been saved to ${_TESTS_LOG}"; \ > - exit $${result} > -.endif > - > .include <bsd.test.mk> > > Modified: head/tools/build/mk/OptionalObsoleteFiles.inc > ============================================================================== > --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 12 04:35:38 2013 (r256364) > +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 12 06:06:53 2013 (r256365) > @@ -69,15 +69,7 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz > .endif > > .if ${MK_ATF} == no > -OLD_DIRS+=etc/atf > -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-sh > -OLD_FILES+=usr/bin/atf-version > OLD_DIRS+=usr/include/atf-c > OLD_FILES+=usr/include/atf-c/build.h > OLD_FILES+=usr/include/atf-c/check.h > @@ -110,34 +102,20 @@ 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/atf-run.hooks > 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_DIRS+=usr/share/examples/atf > -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-check.1.gz > -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-sh.1.gz > OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz > -OLD_FILES+=usr/share/man/man1/atf-version.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/man/man5/atf-formats.5.gz > -OLD_FILES+=usr/share/man/man7/atf.7.gz > OLD_FILES+=usr/share/mk/atf.test.mk > -OLD_DIRS+=usr/share/xml/atf > -OLD_FILES+=usr/share/xml/atf/tests-results.dtd > -OLD_DIRS+=usr/share/xsl/atf > -OLD_FILES+=usr/share/xsl/atf/tests-results.xsl > .endif > > .if ${MK_ATM} == no > > Modified: head/usr.bin/atf/Makefile > ============================================================================== > --- head/usr.bin/atf/Makefile Sat Oct 12 04:35:38 2013 (r256364) > +++ head/usr.bin/atf/Makefile Sat Oct 12 06:06:53 2013 (r256365) > @@ -25,10 +25,6 @@ > # > # $FreeBSD$ > > -SUBDIR= atf-config \ > - atf-report \ > - atf-run \ > - atf-sh \ > - atf-version > +SUBDIR= atf-sh > > .include <bsd.subdir.mk> > > Modified: head/usr.bin/atf/Makefile.inc > ============================================================================== > --- head/usr.bin/atf/Makefile.inc Sat Oct 12 04:35:38 2013 (r256364) > +++ head/usr.bin/atf/Makefile.inc Sat Oct 12 06:06:53 2013 (r256365) > @@ -2,7 +2,5 @@ > > ATF= ${.CURDIR}/../../../contrib/atf > > -CFLAGS+= -DGDB=\"gdb\" > - > BINDIR?= /usr/bin > WARNS?= 3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALCpEUF4sOqP6G6dUY2vs49O3_O6G9XvCfPiRrjxXJ6b6k1vEg>