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 /tools/build | |
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
Diffstat (limited to 'tools/build')
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 6 |
1 files changed, 3 insertions, 3 deletions
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. |