Page MenuHomeFreeBSD

D60928.1795169650.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D60928.1795169650.diff

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1434,8 +1434,12 @@
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 @@
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.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

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 20, 10:14 AM (8 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41473906
Default Alt Text
D60928.1795169650.diff (2 KB)

Event Timeline