Date: Sat, 16 Nov 2013 19:42:40 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258233 - in head: . etc etc/mtree Message-ID: <201311161942.rAGJge1H042851@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Sat Nov 16 19:42:40 2013 New Revision: 258233 URL: http://svnweb.freebsd.org/changeset/base/258233 Log: Move all atf directories to the tests mtree. This is to ensure that test-related directories don't get needlessly created (and later deleted) when MK_TESTS=no. Problem found by jhb@. Approved by: rpaulo (mentor) Modified: head/Makefile.inc1 head/etc/Makefile head/etc/mtree/BSD.include.dist head/etc/mtree/BSD.tests.dist head/etc/mtree/BSD.usr.dist Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Nov 16 19:41:04 2013 (r258232) +++ head/Makefile.inc1 Sat Nov 16 19:42:40 2013 (r258233) @@ -509,7 +509,7 @@ _worldtmp: .endif .if ${MK_TESTS} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ - -p ${WORLDTMP}${TESTSBASE} >/dev/null + -p ${WORLDTMP}/usr >/dev/null .endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sat Nov 16 19:41:04 2013 (r258232) +++ head/etc/Makefile Sat Nov 16 19:42:40 2013 (r258233) @@ -321,7 +321,7 @@ MTREES+= mtree/BSD.debug.dist /usr/lib MTREES+= mtree/BSD.groff.dist /usr .endif .if ${MK_TESTS} != "no" -MTREES+= mtree/BSD.tests.dist ${TESTSBASE} +MTREES+= mtree/BSD.tests.dist /usr .endif .if ${MK_SENDMAIL} != "no" MTREES+= mtree/BSD.sendmail.dist / Modified: head/etc/mtree/BSD.include.dist ============================================================================== --- head/etc/mtree/BSD.include.dist Sat Nov 16 19:41:04 2013 (r258232) +++ head/etc/mtree/BSD.include.dist Sat Nov 16 19:42:40 2013 (r258233) @@ -9,10 +9,6 @@ .. arpa .. - atf-c - .. - atf-c++ - .. bsm .. bsnmp Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Sat Nov 16 19:41:04 2013 (r258232) +++ head/etc/mtree/BSD.tests.dist Sat Nov 16 19:42:40 2013 (r258233) @@ -5,27 +5,43 @@ /set type=dir uname=root gname=wheel mode=0755 . - lib - atf - libatf-c - .. - libatf-c++ - .. - test-programs - .. + include + atf-c .. - libcrypt + atf-c++ .. .. - libexec + share atf - atf-check + .. + doc + atf .. .. .. - usr.bin - atf - atf-sh + tests + lib + atf + libatf-c + .. + libatf-c++ + .. + test-programs + .. + .. + libcrypt + .. + .. + libexec + atf + atf-check + .. + .. + .. + usr.bin + atf + atf-sh + .. .. .. .. Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Sat Nov 16 19:41:04 2013 (r258232) +++ head/etc/mtree/BSD.usr.dist Sat Nov 16 19:42:40 2013 (r258233) @@ -120,8 +120,6 @@ sbin .. share - atf - .. bsdconfig media .. @@ -165,8 +163,6 @@ doc IPv6 .. - atf - .. atm .. legal @@ -1443,6 +1439,4 @@ .. src nochange .. - tests - .. ..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311161942.rAGJge1H042851>