d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move all atf directories to the tests mtree.

Browse Source 
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)
This commit is contained in:
Julio Merino 2013-11-16 19:42:40 +00:00
parent 8496b1293a
commit 5efcd27a34
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -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

2
etc/Makefile
View File

@ -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 /

4
etc/mtree/BSD.include.dist
View File

@ -9,10 +9,6 @@
..
arpa
..
atf-c
..
atf-c++
..
bsm
..
bsnmp

44
etc/mtree/BSD.tests.dist
View File

@ -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
..
..
..
..

6
etc/mtree/BSD.usr.dist
View File

@ -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
..
..