freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

Don't some prune empty dirs created by BSD.tests.dist

Browse Source 
Before this change, directories needed when MK_DTRACE_TESTS != no and
MK_ZFS_TESTS != no but not MK_TESTS != no, were being created via
`BSD.tests.dist` as part of the standard build/install process with the
top-level `hierarchy` target. This behavior resulted in `make check-old`
flagging a lot of issues after 30c20ca26e, even after `make
delete-old` was run and the directories were removed.

Remove the logic which pruned these empty directories; this "fixes" the
issue with `make check-old`, et al and allows a proper technical solution to
`OptionalObsoleteFiles.inc` to be implemented by pkgbase in an unimpeded
manner without introducing additional complexity.

See the review for more details.

PR:		299650
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D60928
This commit is contained in:
Enji Cooper committed 2026-11-04 10:53:51 -08:00
1 parent dd9804f30c
commit 0df8ed538c
1 file changed
+18 -6
Download Patch File Download Diff File Expand all files Collapse all files
tools/build/mk/OptionalObsoleteFiles.inc
+18 -6
View File
@@ -1434,8 +1434,12 @@ OLD_FILES+=usr/share/man/man1/opt.1.gz
CDDL_TEST_DIRS= cddl
. for d in ${CDDL_TEST_DIRS}
. if exists(${DESTDIR}${TESTSBASE}/${d}/)
TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo
OLD_DIRS+=${TESTS_DIRS}
# Bug 299650: do not prune empty directories created by
# `etc/mtree/BSD.tests.dist`.
#
# Read https://reviews.freebsd.org/D60928 for more details.
#TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo
#OLD_DIRS+=${TESTS_DIRS}
TESTS_FILES!=find ${DESTDIR}${TESTSBASE}/${d}/ -type f | sed -e 's,^${DESTDIR}/,,'; echo
OLD_FILES+=${TESTS_FILES}
. endif
@@ -1692,8 +1696,12 @@ OLD_FILES+=${TESTS_FILES}
DTRACE_TEST_DIRS= cddl/usr.sbin/dtrace
. for d in ${DTRACE_TEST_DIRS}
. if exists(${DESTDIR}${TESTSBASE}/${d}/)
TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo
OLD_DIRS+=${TESTS_DIRS}
# Bug 299650: do not prune empty directories created by
# `etc/mtree/BSD.tests.dist`.
#
# Read https://reviews.freebsd.org/D60928 for more details.
#TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo
#OLD_DIRS+=${TESTS_DIRS}
TESTS_FILES!=find ${DESTDIR}${TESTSBASE}/${d}/ -type f | sed -e 's,^${DESTDIR}/,,'; echo
OLD_FILES+=${TESTS_FILES}
. endif
@@ -9471,8 +9479,12 @@ ZFS_TEST_DIRS= cddl/usr.bin/ztest
ZFS_TEST_DIRS+= cddl/usr.sbin/zfsd
. for d in ${ZFS_TEST_DIRS}
. if exists(${DESTDIR}${TESTSBASE}/${d}/)
TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo
OLD_DIRS+=${TESTS_DIRS}
# Bug 299650: do not prune empty directories created by
# `etc/mtree/BSD.tests.dist`.
#
# Read https://reviews.freebsd.org/D60928 for more details.
#TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo
#OLD_DIRS+=${TESTS_DIRS}
TESTS_FILES!=find ${DESTDIR}${TESTSBASE}/${d}/ -type f | sed -e 's,^${DESTDIR}/,,'; echo
OLD_FILES+=${TESTS_FILES}
. endif