svn commit: r275907 - in head: . etc etc/mtree tools/build/mk
Garrett Cooper
ngie at FreeBSD.org
Thu Dec 18 18:16:03 UTC 2014
Author: ngie
Date: Thu Dec 18 18:16:00 2014
New Revision: 275907
URL: https://svnweb.freebsd.org/changeset/base/275907
Log:
Fix building/installing tests when TESTSBASE != /usr/tests
The work in r258233 hardcoded the assumption that tests was the last component
of the tests tree by pushing tests as an explicit prefix for the paths in
BSD.tests.dist and /usr was the prefix for all tests, per BSD.usr.dist and all
of the mtree calls used in Makefile.inc1. This assumption breaks if/when one
provides a custom TESTSBASE "prefix", e.g. TESTSBASE=/mytests .
One thing that r258233 did properly though was remove "/usr/tests" creation
from BSD.usr.dist -- that should have not been there in the first place. That
was an "oops" on my part for the work that was originally committed in r241823
MFC after: 2 weeks
Phabric: D1301
Reviewed by: imp
Sponsored by: EMC / Isilon Storage Division
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
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Dec 18 18:10:39 2014 (r275906)
+++ head/Makefile.inc1 Thu Dec 18 18:16:00 2014 (r275907)
@@ -526,8 +526,9 @@ _worldtmp:
-p ${WORLDTMP}/usr/lib >/dev/null
.endif
.if ${MK_TESTS} != "no"
+ mkdir -p ${WORLDTMP}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
- -p ${WORLDTMP}/usr >/dev/null
+ -p ${WORLDTMP}${TESTSBASE} >/dev/null
.endif
.for _mtree in ${LOCAL_MTREE}
mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
@@ -866,8 +867,9 @@ distributeworld installworld: _installch
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
.endif
.if ${MK_TESTS} != "no" && ${dist} == "tests"
+ -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
- -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
+ -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
.endif
.if defined(NO_ROOT)
${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
@@ -2085,8 +2087,9 @@ _xi-mtree:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${XDDESTDIR}/usr/include >/dev/null
.if ${MK_TESTS} != "no"
+ mkdir -p ${XDDESTDIR}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
- -p ${XDDESTDIR}/usr >/dev/null
+ -p ${XDDESTDIR}${TESTSBASE} >/dev/null
.endif
.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Thu Dec 18 18:10:39 2014 (r275906)
+++ head/etc/Makefile Thu Dec 18 18:16:00 2014 (r275907)
@@ -333,7 +333,7 @@ MTREES+= mtree/BSD.debug.dist /usr/lib
MTREES+= mtree/BSD.groff.dist /usr
.endif
.if ${MK_TESTS} != "no"
-MTREES+= mtree/BSD.tests.dist /usr
+MTREES+= mtree/BSD.tests.dist ${TESTSBASE}
.endif
.if ${MK_SENDMAIL} != "no"
MTREES+= mtree/BSD.sendmail.dist /
@@ -349,6 +349,7 @@ distrib-dirs: ${MTREES:N/*}
shift; \
d=${DESTDIR}$$1; \
shift; \
+ test -d $$d || mkdir -p $$d; \
${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \
-f $$m -p $$d; \
${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
@@ -362,6 +363,7 @@ distrib-dirs: ${MTREES:N/*}
test "$$d" == "/" && d=""; \
d=${DISTBASE}$$d; \
shift; \
+ test -d $$d || mkdir -p $$d; \
${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
"sed s#^\.#.$$d# | ${METALOG.add}" ; \
${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist Thu Dec 18 18:10:39 2014 (r275906)
+++ head/etc/mtree/BSD.include.dist Thu Dec 18 18:16:00 2014 (r275907)
@@ -9,6 +9,10 @@
..
arpa
..
+ atf-c
+ ..
+ atf-c++
+ ..
bsm
..
bsnmp
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Thu Dec 18 18:10:39 2014 (r275906)
+++ head/etc/mtree/BSD.tests.dist Thu Dec 18 18:16:00 2014 (r275907)
@@ -5,410 +5,392 @@
/set type=dir uname=root gname=wheel mode=0755
.
- include
- atf-c
+ bin
+ chown
..
- atf-c++
+ date
..
- ..
- share
- atf
+ mv
..
- doc
- atf
- ..
- pjdfstest
- ..
+ pax
..
- ..
- tests
- bin
- chown
+ pkill
+ ..
+ sh
+ builtins
..
- date
+ errors
..
- mv
+ execution
..
- pax
+ expansion
..
- pkill
+ parameters
..
- sh
- builtins
- ..
- errors
- ..
- execution
- ..
- expansion
- ..
- parameters
- ..
- parser
- ..
- set-e
- ..
+ parser
..
- sleep
- ..
- test
+ set-e
..
..
- cddl
- lib
- ..
- sbin
- ..
- usr.bin
- ..
- usr.sbin
- ..
+ sleep
+ ..
+ test
+ ..
+ ..
+ cddl
+ lib
..
- etc
+ sbin
..
- games
+ usr.bin
..
- gnu
- lib
- ..
- usr.bin
- diff
- ..
- ..
+ usr.sbin
..
+ ..
+ etc
+ ..
+ games
+ ..
+ gnu
lib
- atf
- libatf-c
- detail
- ..
- ..
- libatf-c++
- detail
- ..
- ..
- test-programs
- ..
+ ..
+ usr.bin
+ diff
..
- libc
- c063
- ..
- db
- ..
- gen
- execve
- ..
- posix_spawn
- ..
+ ..
+ ..
+ lib
+ atf
+ libatf-c
+ detail
..
- hash
- data
- ..
+ ..
+ libatf-c++
+ detail
..
- inet
+ ..
+ test-programs
+ ..
+ ..
+ libc
+ c063
+ ..
+ db
+ ..
+ gen
+ execve
..
- locale
+ posix_spawn
..
- net
- getaddrinfo
- data
- ..
- ..
+ ..
+ hash
+ data
..
- regex
+ ..
+ inet
+ ..
+ locale
+ ..
+ net
+ getaddrinfo
data
..
..
- ssp
- ..
- stdio
- ..
- stdlib
- ..
- string
- ..
- sys
- ..
- time
- ..
- tls
- dso
- ..
- ..
- termios
- ..
- ttyio
+ ..
+ regex
+ data
..
..
- libcrypt
+ ssp
..
- libmp
+ stdio
..
- libnv
+ stdlib
..
- libpam
+ string
..
- libproc
+ sys
..
- librt
+ time
..
- libthr
- dlopen
+ tls
+ dso
..
..
- libutil
+ termios
..
- msun
+ ttyio
..
..
+ libcrypt
+ ..
+ libmp
+ ..
+ libnv
+ ..
+ libpam
+ ..
+ libproc
+ ..
+ librt
+ ..
+ libthr
+ dlopen
+ ..
+ ..
+ libutil
+ ..
+ msun
+ ..
+ ..
+ libexec
+ atf
+ atf-check
+ ..
+ atf-sh
+ ..
+ ..
+ rtld-elf
+ ..
+ ..
+ sbin
+ dhclient
+ ..
+ devd
+ ..
+ growfs
+ ..
+ mdconfig
+ ..
+ ..
+ secure
+ lib
+ ..
libexec
- atf
- atf-check
+ ..
+ usr.bin
+ ..
+ usr.sbin
+ ..
+ ..
+ share
+ examples
+ tests
+ atf
..
- atf-sh
+ plain
..
..
- rtld-elf
- ..
..
- sbin
- dhclient
+ ..
+ sys
+ kern
+ ..
+ netinet
+ ..
+ opencrypto
+ ..
+ pjdfstest
+ chflags
+ ..
+ chmod
..
- devd
+ chown
..
- growfs
+ ftruncate
..
- mdconfig
+ granular
..
- ..
- secure
- lib
+ link
..
- libexec
+ mkdir
..
- usr.bin
+ mkfifo
..
- usr.sbin
+ mknod
..
- ..
- share
- examples
- tests
- atf
- ..
- plain
- ..
- ..
+ open
..
- ..
- sys
- kern
+ rename
..
- netinet
+ rmdir
..
- opencrypto
+ symlink
..
- pjdfstest
- chflags
+ truncate
+ ..
+ unlink
+ ..
+ ..
+ ..
+ usr.bin
+ apply
+ ..
+ basename
+ ..
+ bmake
+ archives
+ fmt_44bsd
..
- chmod
+ fmt_44bsd_mod
..
- chown
+ fmt_oldbsd
..
- ftruncate
+ ..
+ basic
+ t0
..
- granular
+ t1
..
- link
+ t2
..
- mkdir
+ t3
..
- mkfifo
+ ..
+ execution
+ ellipsis
..
- mknod
+ empty
..
- open
+ joberr
..
- rename
+ plus
..
- rmdir
+ ..
+ shell
+ builtin
..
- symlink
+ meta
..
- truncate
+ path
..
- unlink
+ path_select
..
- ..
- ..
- usr.bin
- apply
- ..
- basename
- ..
- bmake
- archives
- fmt_44bsd
- ..
- fmt_44bsd_mod
- ..
- fmt_oldbsd
- ..
+ replace
+ ..
+ select
..
+ ..
+ suffixes
basic
- t0
- ..
- t1
- ..
- t2
- ..
- t3
- ..
..
- execution
- ellipsis
- ..
- empty
- ..
- joberr
- ..
- plus
- ..
+ src_wild1
..
- shell
- builtin
- ..
- meta
- ..
- path
- ..
- path_select
- ..
- replace
- ..
- select
- ..
+ src_wild2
..
- suffixes
- basic
- ..
- src_wild1
- ..
- src_wild2
- ..
+ ..
+ syntax
+ directive-t0
..
- syntax
- directive-t0
- ..
- enl
- ..
- funny-targets
- ..
- semi
- ..
+ enl
..
- sysmk
- t0
- 2
- 1
- ..
- ..
- mk
- ..
- ..
- t1
- 2
- 1
- ..
- ..
- mk
+ funny-targets
+ ..
+ semi
+ ..
+ ..
+ sysmk
+ t0
+ 2
+ 1
..
..
- t2
- 2
- 1
- ..
- ..
- mk
- ..
+ mk
..
..
- variables
- modifier_M
+ t1
+ 2
+ 1
+ ..
..
- modifier_t
+ mk
..
- opt_V
+ ..
+ t2
+ 2
+ 1
+ ..
..
- t0
+ mk
..
..
..
- calendar
- ..
- cmp
- ..
- comm
- ..
- cut
- ..
- dirname
- ..
- file2c
- ..
- grep
- ..
- gzip
- ..
- join
- ..
- jot
- ..
- lastcomm
- ..
- m4
- ..
- mkimg
- ..
- ncal
- ..
- printf
- ..
- sed
- regress.multitest.out
+ variables
+ modifier_M
..
- ..
- timeout
- ..
- tr
- ..
- truncate
- ..
- units
- ..
- uudecode
- ..
- uuencode
- ..
- xargs
- ..
- yacc
- yacc
+ modifier_t
+ ..
+ opt_V
+ ..
+ t0
..
..
..
- usr.sbin
- etcupdate
- ..
- newsyslog
- ..
- nmtree
- ..
- pw
+ calendar
+ ..
+ cmp
+ ..
+ comm
+ ..
+ cut
+ ..
+ dirname
+ ..
+ file2c
+ ..
+ grep
+ ..
+ gzip
+ ..
+ join
+ ..
+ jot
+ ..
+ lastcomm
+ ..
+ m4
+ ..
+ mkimg
+ ..
+ ncal
+ ..
+ printf
+ ..
+ sed
+ regress.multitest.out
..
- sa
+ ..
+ timeout
+ ..
+ tr
+ ..
+ truncate
+ ..
+ units
+ ..
+ uudecode
+ ..
+ uuencode
+ ..
+ xargs
+ ..
+ yacc
+ yacc
..
..
..
+ usr.sbin
+ etcupdate
+ ..
+ newsyslog
+ ..
+ nmtree
+ ..
+ pw
+ ..
+ sa
+ ..
+ ..
..
# vim: set expandtab ts=4 sw=4:
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Thu Dec 18 18:10:39 2014 (r275906)
+++ head/etc/mtree/BSD.usr.dist Thu Dec 18 18:16:00 2014 (r275907)
@@ -126,6 +126,8 @@
sbin
..
share
+ atf
+ ..
bsdconfig
media
..
@@ -169,6 +171,8 @@
doc
IPv6
..
+ atf
+ ..
atm
..
legal
@@ -189,6 +193,8 @@
..
papers
..
+ pjdfstest
+ ..
psd
01.cacm
..
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Dec 18 18:10:39 2014 (r275906)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Dec 18 18:16:00 2014 (r275907)
@@ -4663,10 +4663,10 @@ OLD_FILES+=usr/share/man/man4/atf-test-c
OLD_FILES+=usr/share/mk/atf.test.mk
# Test suite.
-. if(exists(${DESTDIR}/usr/tests/))
-TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,'; echo
+. if exists(${DESTDIR}${TESTSBASE})
+TESTS_DIRS!=find ${DESTDIR}${TESTSBASE} -type d | sed -e 's,^${DESTDIR}/,,'; echo
OLD_DIRS+=${TESTS_DIRS}
-TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
+TESTS_FILES!=find ${DESTDIR}${TESTSBASE} \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
OLD_FILES+=${TESTS_FILES}
. endif
.endif # Test suite.
More information about the svn-src-head
mailing list