Date: Tue, 8 Oct 2013 22:39:03 -0400 From: Julio Merino <julio@meroh.net> To: Garrett Cooper <yaneurabeya@gmail.com> Cc: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>, Rui Paulo <rpaulo@netbsd.org> Subject: Re: Getting rid of the ATF tools Message-ID: <CADyfeQV8CWW%2BEfx1yHbBOYPqgLyedxn0pM2OqwTYoiCTYtHREQ@mail.gmail.com> In-Reply-To: <E730B6FF-6E56-4F09-BD92-04AA2D0A5B33@gmail.com> References: <20130719200017.GA79155@mastodon.meroh.net> <CAGHfRMC9xV6QRBieQp-kJW1OMqXgqDmhjQ3DGPQTJ2Swg3B3%2BQ@mail.gmail.com> <CADyfeQX27p5G9eeOFcxzN1iuNnerqFFumB9---HL2tYdwfNkrQ@mail.gmail.com> <CAGHfRMAHMmeBkrURko7RO87p2wBKYvo9cAP7s6h0qOUJnbyfAg@mail.gmail.com> <CADyfeQUAcbSLNWVzP24WEgsnt4Qqf9Ge--aD6LwakmBj5zjgFQ@mail.gmail.com> <8D6EC091-EA47-4B0F-B270-429C596FAF52@gmail.com> <CAOtMX2iUjta0v5BzLfdtV6X8wHrC_-%2Bu1ve5v9nQ-c-eLD-g9A@mail.gmail.com> <CAGHfRMBQRQswNecOzXK0Cxh6=m4pKXOZ1Pwhg82SMdOc-E%2BPyA@mail.gmail.com> <CAGHfRMBw2AA_Qg6miMN8G5gP=-x1APhfojr5bZ-yBkGopxeaUw@mail.gmail.com> <99FC4C89-8D12-44BB-8B3A-08D22B0028B6@gmail.com> <E730B6FF-6E56-4F09-BD92-04AA2D0A5B33@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Hello everyone, [ Reviving this old thread, so abusing top-posting... ] FreeBSD 10 is around the corner. If nothing changes, this will be the first release with ATF built-in, which is great but... I'd still strongly recommend not to bundle the atf-run / atf-report tools in the tree and instead just keep them in ports (for now). Keeping the tools in the tree will set precedent as to a) how the tools behave and b) the fact that they are part of the base system. Both of these will make the transition to Kyua later on more complex for no reason: you know that transitions are always hard when users out there get used to something! If not, check out how the transition plan for NetBSD looked like ( http://wiki.netbsd.org/kyua/import/ ); not pretty. I think there is still time to undo the addition of the tools before the release is cut. And, for this reason, I'm attaching two related and updated patches. (Should I be filing a PR instead, or sending this to freebsd-testing?) Who can make the call about this? Thanks! On Tue, Jul 30, 2013 at 3:40 AM, Garrett Cooper <yaneurabeya@gmail.com> wrote: > On Jul 26, 2013, at 11:03 AM, Garrett Cooper wrote: > >> On Jul 22, 2013, at 7:54 PM, Garrett Cooper wrote: >> >>> On Mon, Jul 22, 2013 at 1:15 PM, Garrett Cooper <yaneurabeya@gmail.com> wrote: >>>> On Mon, Jul 22, 2013 at 12:54 PM, Alan Somers <asomers@freebsd.org> wrote: >>>>> Speaking of backporting, has anybody yet merged Garrett's git branch >>>>> to a stable/9 based branch? We're still basing our bsd.test.mk etc >>>>> off of a very old branch of Garrett's. >>>>> >>>>> (sorry for double post; I sent the last post from the wrong email >>>>> alias so the message didn't get accepted by mailman) >>>> >>>> No one has yet. And speaking of backporting, now the test >>>> infrastructure will allow you to build and install tests without bmake >>>> if you apply this commit: >>>> >>>> https://github.com/yaneurabeya/freebsd/commit/79d9a53836dcf8127d17c35705dd8c79b040fc04 >>>> >>>> This is what I'm going to push into OneFS and is what should get >>>> pushed into FreeBSD as well. >>> >>> I'll pull back things to stable/9. I have one box at home that I can >>> use for this effort (it's running stable/9). It would be curious to >>> see how 9.2-BETA1 fares compared to 10.0-CURRENT anyhoo… >> >> Work taking place here for $work: https://github.com/yaneurabeya/freebsd/tree/stable-9-atf . Still not 100% there, but I should have things more sane in a couple of weeks (a lot of the pieces are already in place). > > And once I've worked out the patch from stable/9 (it's building stably -- I just need to run the tests and compare the results between 9 and 10), I'll create another branch for stable/8 as we (Isilon) need to hop to that before stable/9. > Thanks, > -Garrett > -- Julio Merino / @jmmv [-- Attachment #2 --] Index: ObsoleteFiles.inc =================================================================== --- ObsoleteFiles.inc (revision 256174) +++ ObsoleteFiles.inc (working copy) @@ -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 # 20131015: removal of RCS from base OLD_FILES+=usr/bin/ci OLD_FILES+=usr/bin/co @@ -6114,6 +6133,13 @@ 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 Index: etc/Makefile =================================================================== --- etc/Makefile (revision 256174) +++ etc/Makefile (working copy) @@ -215,9 +215,6 @@ 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 Index: etc/atf/FreeBSD.conf =================================================================== --- etc/atf/FreeBSD.conf (revision 256174) +++ etc/atf/FreeBSD.conf (working copy) @@ -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 Index: etc/atf/Makefile =================================================================== --- etc/atf/Makefile (revision 256174) +++ etc/atf/Makefile (working copy) @@ -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> Index: etc/atf/common.conf =================================================================== --- etc/atf/common.conf (revision 256174) +++ etc/atf/common.conf (working copy) @@ -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" Index: etc/atf/FreeBSD.conf =================================================================== --- etc/atf/FreeBSD.conf (revision 256174) +++ etc/atf/FreeBSD.conf (working copy) @@ -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 Index: etc/atf/Makefile =================================================================== --- etc/atf/Makefile (revision 256174) +++ etc/atf/Makefile (working copy) @@ -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> Index: etc/atf/common.conf =================================================================== --- etc/atf/common.conf (revision 256174) +++ etc/atf/common.conf (working copy) @@ -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" Index: etc/mtree/BSD.root.dist =================================================================== --- etc/mtree/BSD.root.dist (revision 256174) +++ etc/mtree/BSD.root.dist (working copy) @@ -24,8 +24,6 @@ etc X11 .. - atf - .. bluetooth .. defaults Index: etc/mtree/BSD.usr.dist =================================================================== --- etc/mtree/BSD.usr.dist (revision 256174) +++ etc/mtree/BSD.usr.dist (working copy) @@ -299,8 +299,6 @@ .. IPv6 .. - atf - .. bhyve .. bootforth @@ -1410,14 +1408,6 @@ catalog .. .. - xml - atf - .. - .. - xsl - atf - .. - .. zoneinfo Africa .. Index: lib/libcrypt/tests/crypt_tests.c =================================================================== --- lib/libcrypt/tests/crypt_tests.c (revision 256174) +++ lib/libcrypt/tests/crypt_tests.c (working copy) @@ -43,7 +43,7 @@ /* * 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) { Index: share/Makefile =================================================================== --- share/Makefile (revision 256174) +++ share/Makefile (working copy) @@ -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 @@ 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 Index: share/atf/Makefile =================================================================== --- share/atf/Makefile (revision 256174) +++ share/atf/Makefile (working copy) @@ -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> Index: share/atf/Makefile =================================================================== --- share/atf/Makefile (revision 256174) +++ share/atf/Makefile (working copy) @@ -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> Index: share/examples/Makefile =================================================================== --- share/examples/Makefile (revision 256174) +++ share/examples/Makefile (working copy) @@ -241,9 +241,6 @@ .if ${SHARED} != "symlinks" SUBDIR= smbfs -.if ${MK_ATF} != "no" -SUBDIR+=atf -.endif .if ${MK_IPFILTER} != "no" SUBDIR+=ipfilter .endif Index: share/examples/atf/Makefile =================================================================== --- share/examples/atf/Makefile (revision 256174) +++ share/examples/atf/Makefile (working copy) @@ -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> Index: share/examples/atf/Makefile =================================================================== --- share/examples/atf/Makefile (revision 256174) +++ share/examples/atf/Makefile (working copy) @@ -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> Index: share/man/man5/Makefile =================================================================== --- share/man/man5/Makefile (revision 256174) +++ share/man/man5/Makefile (working copy) @@ -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+=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 Index: share/man/man7/Makefile =================================================================== --- share/man/man7/Makefile (revision 256174) +++ share/man/man7/Makefile (working copy) @@ -36,17 +36,4 @@ 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> Index: share/mk/atf.test.mk =================================================================== --- share/mk/atf.test.mk (revision 256174) +++ share/mk/atf.test.mk (working copy) @@ -51,98 +51,4 @@ .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> Index: share/xml/Makefile =================================================================== --- share/xml/Makefile (revision 256174) +++ share/xml/Makefile (working copy) @@ -1,36 +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$ - -.include <bsd.own.mk> - -SUBDIR+= ${_atf} - -.if ${MK_ATF} != "no" -_atf= atf -.endif - -.include <bsd.subdir.mk> Index: share/xml/Makefile.inc =================================================================== --- share/xml/Makefile.inc (revision 256174) +++ share/xml/Makefile.inc (working copy) @@ -1,30 +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$ - -BINDIR?= ${SHAREDIR}/xml - -# vim: syntax=make Index: share/xml/atf/Makefile =================================================================== --- share/xml/atf/Makefile (revision 256174) +++ share/xml/atf/Makefile (working copy) @@ -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 - -NO_OBJ= - -FILESGROUPS= XML - -XMLDIR= ${SHAREDIR}/xml/atf -XML= tests-results.dtd - -.include <bsd.prog.mk> Index: share/xml/Makefile =================================================================== --- share/xml/Makefile (revision 256174) +++ share/xml/Makefile (working copy) @@ -1,36 +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$ - -.include <bsd.own.mk> - -SUBDIR+= ${_atf} - -.if ${MK_ATF} != "no" -_atf= atf -.endif - -.include <bsd.subdir.mk> Index: share/xml/Makefile.inc =================================================================== --- share/xml/Makefile.inc (revision 256174) +++ share/xml/Makefile.inc (working copy) @@ -1,30 +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$ - -BINDIR?= ${SHAREDIR}/xml - -# vim: syntax=make Index: share/xml/atf/Makefile =================================================================== --- share/xml/atf/Makefile (revision 256174) +++ share/xml/atf/Makefile (working copy) @@ -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 - -NO_OBJ= - -FILESGROUPS= XML - -XMLDIR= ${SHAREDIR}/xml/atf -XML= tests-results.dtd - -.include <bsd.prog.mk> Index: share/xml/atf/Makefile =================================================================== --- share/xml/atf/Makefile (revision 256174) +++ share/xml/atf/Makefile (working copy) @@ -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 - -NO_OBJ= - -FILESGROUPS= XML - -XMLDIR= ${SHAREDIR}/xml/atf -XML= tests-results.dtd - -.include <bsd.prog.mk> Index: share/xsl/Makefile =================================================================== --- share/xsl/Makefile (revision 256174) +++ share/xsl/Makefile (working copy) @@ -1,36 +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$ - -.include <bsd.own.mk> - -SUBDIR+= ${_atf} - -.if ${MK_ATF} != "no" -_atf= atf -.endif - -.include <bsd.subdir.mk> Index: share/xsl/Makefile.inc =================================================================== --- share/xsl/Makefile.inc (revision 256174) +++ share/xsl/Makefile.inc (working copy) @@ -1,30 +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$ - -BINDIR?= ${SHAREDIR}/xsl - -# vim: syntax=make Index: share/xsl/atf/Makefile =================================================================== --- share/xsl/atf/Makefile (revision 256174) +++ share/xsl/atf/Makefile (working copy) @@ -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 - -NO_OBJ= - -FILESGROUPS= XSL - -XSLDIR= ${SHAREDIR}/xsl/atf -XSL= tests-results.xsl - -.include <bsd.prog.mk> Index: share/xsl/Makefile =================================================================== --- share/xsl/Makefile (revision 256174) +++ share/xsl/Makefile (working copy) @@ -1,36 +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$ - -.include <bsd.own.mk> - -SUBDIR+= ${_atf} - -.if ${MK_ATF} != "no" -_atf= atf -.endif - -.include <bsd.subdir.mk> Index: share/xsl/Makefile.inc =================================================================== --- share/xsl/Makefile.inc (revision 256174) +++ share/xsl/Makefile.inc (working copy) @@ -1,30 +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$ - -BINDIR?= ${SHAREDIR}/xsl - -# vim: syntax=make Index: share/xsl/atf/Makefile =================================================================== --- share/xsl/atf/Makefile (revision 256174) +++ share/xsl/atf/Makefile (working copy) @@ -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 - -NO_OBJ= - -FILESGROUPS= XSL - -XSLDIR= ${SHAREDIR}/xsl/atf -XSL= tests-results.xsl - -.include <bsd.prog.mk> Index: share/xsl/atf/Makefile =================================================================== --- share/xsl/atf/Makefile (revision 256174) +++ share/xsl/atf/Makefile (working copy) @@ -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 - -NO_OBJ= - -FILESGROUPS= XSL - -XSLDIR= ${SHAREDIR}/xsl/atf -XSL= tests-results.xsl - -.include <bsd.prog.mk> Index: tools/build/mk/OptionalObsoleteFiles.inc =================================================================== --- tools/build/mk/OptionalObsoleteFiles.inc (revision 256174) +++ tools/build/mk/OptionalObsoleteFiles.inc (working copy) @@ -69,15 +69,7 @@ .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,7 +102,6 @@ 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 @@ -117,27 +108,14 @@ 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 Index: usr.bin/atf/Makefile =================================================================== --- usr.bin/atf/Makefile (revision 256174) +++ usr.bin/atf/Makefile (working copy) @@ -25,10 +25,6 @@ # # $FreeBSD$ -SUBDIR= atf-config \ - atf-report \ - atf-run \ - atf-sh \ - atf-version +SUBDIR= atf-sh .include <bsd.subdir.mk> Index: usr.bin/atf/Makefile.inc =================================================================== --- usr.bin/atf/Makefile.inc (revision 256174) +++ usr.bin/atf/Makefile.inc (working copy) @@ -2,7 +2,5 @@ ATF= ${.CURDIR}/../../../contrib/atf -CFLAGS+= -DGDB=\"gdb\" - BINDIR?= /usr/bin WARNS?= 3 Index: usr.bin/atf/atf-config/Makefile =================================================================== --- usr.bin/atf/atf-config/Makefile (revision 256174) +++ usr.bin/atf/atf-config/Makefile (working copy) @@ -1,42 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-config - -PROG_CXX= atf-config -SRCS= atf-config.cpp -MAN= atf-config.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-config/Makefile =================================================================== --- usr.bin/atf/atf-config/Makefile (revision 256174) +++ usr.bin/atf/atf-config/Makefile (working copy) @@ -1,42 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-config - -PROG_CXX= atf-config -SRCS= atf-config.cpp -MAN= atf-config.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-report/Makefile =================================================================== --- usr.bin/atf/atf-report/Makefile (revision 256174) +++ usr.bin/atf/atf-report/Makefile (working copy) @@ -1,42 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-report - -PROG_CXX= atf-report -SRCS= atf-report.cpp reader.cpp -MAN= atf-report.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-report/Makefile =================================================================== --- usr.bin/atf/atf-report/Makefile (revision 256174) +++ usr.bin/atf/atf-report/Makefile (working copy) @@ -1,42 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-report - -PROG_CXX= atf-report -SRCS= atf-report.cpp reader.cpp -MAN= atf-report.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-run/Makefile =================================================================== --- usr.bin/atf/atf-run/Makefile (revision 256174) +++ usr.bin/atf/atf-run/Makefile (working copy) @@ -1,44 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-run - -PROG_CXX= atf-run -SRCS= atf-run.cpp atffile.cpp config.cpp fs.cpp io.cpp requirements.cpp \ - signals.cpp test-program.cpp timer.cpp user.cpp -MAN= atf-run.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} -CFLAGS+= -I${.CURDIR}/../../lib/libatf-c - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-run/Makefile =================================================================== --- usr.bin/atf/atf-run/Makefile (revision 256174) +++ usr.bin/atf/atf-run/Makefile (working copy) @@ -1,44 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-run - -PROG_CXX= atf-run -SRCS= atf-run.cpp atffile.cpp config.cpp fs.cpp io.cpp requirements.cpp \ - signals.cpp test-program.cpp timer.cpp user.cpp -MAN= atf-run.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} -CFLAGS+= -I${.CURDIR}/../../lib/libatf-c - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-version/Makefile =================================================================== --- usr.bin/atf/atf-version/Makefile (revision 256174) +++ usr.bin/atf/atf-version/Makefile (working copy) @@ -1,52 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-version - -PROG_CXX= atf-version -SRCS= atf-version.cpp revision.h -MAN= atf-version.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} -CFLAGS+= -I${.CURDIR}/../../lib/libatf-c -CFLAGS+= -I${.CURDIR} -CFLAGS+= -I. - -CLEANFILES+= revision.h -revision.h: - @sh ${ATF}/atf-version/generate-revision.sh \ - -o ${.TARGET} \ - -r ${ATF} \ - -v `awk '$$2 == "VERSION" { print $$3 }' ${ATF}/bconfig.h` - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> Index: usr.bin/atf/atf-version/Makefile =================================================================== --- usr.bin/atf/atf-version/Makefile (revision 256174) +++ usr.bin/atf/atf-version/Makefile (working copy) @@ -1,52 +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$ - -.include <bsd.init.mk> - -.PATH: ${ATF}/atf-version - -PROG_CXX= atf-version -SRCS= atf-version.cpp revision.h -MAN= atf-version.1 - -CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${ATF} -CFLAGS+= -I${.CURDIR}/../../lib/libatf-c -CFLAGS+= -I${.CURDIR} -CFLAGS+= -I. - -CLEANFILES+= revision.h -revision.h: - @sh ${ATF}/atf-version/generate-revision.sh \ - -o ${.TARGET} \ - -r ${ATF} \ - -v `awk '$$2 == "VERSION" { print $$3 }' ${ATF}/bconfig.h` - -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c - -.include <bsd.prog.mk> [-- Attachment #3 --] Index: etc/ftpusers =================================================================== --- etc/ftpusers (revision 256174) +++ etc/ftpusers (working copy) @@ -15,7 +15,7 @@ sshd smmsp mailnull -_atf +_tests bind unbound proxy Index: etc/group =================================================================== --- etc/group (revision 256174) +++ etc/group (working copy) @@ -16,7 +16,7 @@ sshd:*:22: smmsp:*:25: mailnull:*:26: -_atf:*:27: +_tests:*:27: guest:*:31: bind:*:53: unbound:*:59: Index: etc/master.passwd =================================================================== --- etc/master.passwd (revision 256174) +++ etc/master.passwd (working copy) @@ -13,7 +13,7 @@ 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 +_tests:*: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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADyfeQV8CWW%2BEfx1yHbBOYPqgLyedxn0pM2OqwTYoiCTYtHREQ>