diff options
author | ngie <ngie@FreeBSD.org> | 2015-01-20 23:39:08 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-01-20 23:39:08 +0000 |
commit | 259bd5c13f97907a25dbb2157b57e401dea81537 (patch) | |
tree | 9965711aad3132b64dd17ff4948193965abce125 | |
parent | a170f61a5a8db7610283797dbe8a3526038072e6 (diff) | |
download | FreeBSD-src-259bd5c13f97907a25dbb2157b57e401dea81537.zip FreeBSD-src-259bd5c13f97907a25dbb2157b57e401dea81537.tar.gz |
MFC r275907:
r275907 (by ngie):
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
Phabric: D1301
Reviewed by: imp
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | Makefile.inc1 | 9 | ||||
-rw-r--r-- | etc/Makefile | 4 | ||||
-rw-r--r-- | etc/mtree/BSD.include.dist | 4 | ||||
-rw-r--r-- | etc/mtree/BSD.tests.dist | 576 | ||||
-rw-r--r-- | etc/mtree/BSD.usr.dist | 6 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 6 |
6 files changed, 302 insertions, 303 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b6a3f03..b76c63b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -513,8 +513,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 @@ -853,8 +854,9 @@ distributeworld installworld: _installcheck_world -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} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ @@ -1997,8 +1999,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 _xi-links diff --git a/etc/Makefile b/etc/Makefile index b1013e6..85dad70 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -327,7 +327,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 / @@ -343,6 +343,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; \ @@ -356,6 +357,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# | \ diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index ee9cc9b..011fa61 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -9,6 +9,10 @@ .. arpa .. + atf-c + .. + atf-c++ + .. bsm .. bsnmp diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 0c6df59..da5de5a 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -5,394 +5,378 @@ /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 - date + pkill + .. + sh + builtins .. - mv + errors .. - pax + execution .. - pkill + expansion .. - sh - builtins - .. - errors - .. - execution - .. - expansion - .. - parameters - .. - parser - .. - set-e - .. + parameters .. - sleep + parser .. - test + set-e .. .. - cddl - lib - .. - sbin - .. - usr.bin - .. - usr.sbin - .. + sleep .. - etc + test .. - games + .. + cddl + lib .. - gnu - lib - .. - usr.bin - diff - .. - .. + sbin + .. + usr.bin + .. + 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 + .. + stdio .. - libmp + stdlib .. - librt + string .. - libthr - dlopen + sys + .. + time + .. + tls + dso .. .. - libutil + termios + .. + ttyio + .. + .. + libcrypt + .. + libmp + .. + librt + .. + libthr + dlopen + .. + .. + libutil + .. + msun + .. + .. + libexec + atf + atf-check .. - msun + atf-sh .. .. + .. + sbin + dhclient + .. + devd + .. + growfs + .. + mdconfig + .. + .. + secure + lib + .. libexec - atf - atf-check + .. + usr.bin + .. + usr.sbin + .. + .. + share + examples + tests + atf .. - atf-sh + plain .. .. .. - sbin - dhclient + .. + sys + kern + .. + netinet + .. + pjdfstest + chflags .. - devd + chmod .. - growfs + chown .. - mdconfig + ftruncate .. - .. - secure - lib + granular .. - libexec + link .. - usr.bin + mkdir .. - usr.sbin + mkfifo .. - .. - share - examples - tests - atf - .. - plain - .. - .. + mknod .. - .. - sys - kern + open + .. + rename + .. + rmdir .. - netinet + 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 - .. - ncal - .. - opensm - .. - printf - .. - sed - regress.multitest.out + variables + modifier_M .. - .. - tr - .. - truncate - .. - 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 + .. + ncal + .. + opensm + .. + printf + .. + sed + regress.multitest.out .. - sa + .. + tr + .. + truncate + .. + uudecode + .. + uuencode + .. + xargs + .. + yacc + yacc .. .. .. + usr.sbin + etcupdate + .. + newsyslog + .. + nmtree + .. + pw + .. + sa + .. + .. .. # vim: set expandtab ts=4 sw=4: diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index a310e88..6bdb88c 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -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 .. diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3e647da..79e5313 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4585,10 +4585,10 @@ OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz 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. |