git: fca1e5d1ef18 - stable/14 - Remove example tests when MK_EXAMPLES=no
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 Feb 2026 04:09:58 UTC
The branch stable/14 has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=fca1e5d1ef1853a823825407223cc7ff7d85a111
commit fca1e5d1ef1853a823825407223cc7ff7d85a111
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-02-01 17:12:44 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-02-22 04:09:49 +0000
Remove example tests when MK_EXAMPLES=no
This change cleans up example tests for atf, googletest, plain, and TAP
when MK_EXAMPLES=no. Not having this in results
`kyua test -k /usr/tests/share/examples/Kyuafile` being broken on a host
where the content in that directory tree is stale. I ran into that case
because at some point in time in the past I had specified
`MK_GOOGLETEST=no` one of my dev instances.
MFC after: 1 week
(cherry picked from commit cea2683bb691d6cbcfb7e342c497d018bba712c2)
---
tools/build/mk/OptionalObsoleteFiles.inc | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index e5626cf2144f..72b495416d3b 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1927,6 +1927,26 @@ OLD_FILES+=usr/share/examples/sunrpc/sort/Makefile
OLD_FILES+=usr/share/examples/sunrpc/sort/rsort.c
OLD_FILES+=usr/share/examples/sunrpc/sort/sort.x
OLD_FILES+=usr/share/examples/sunrpc/sort/sort_proc.c
+OLD_FILES+=usr/tests/share/examples/tests/atf/Kyuafile
+OLD_FILES+=usr/tests/share/examples/tests/atf/cp_test
+OLD_FILES+=usr/tests/share/examples/tests/atf/printf_test
+OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample2_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample3_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample4_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample5_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample6_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample7_unittest
+OLD_FILES+=usr/tests/share/examples/tests/googletest/sample8_unittest
+OLD_FILES+=usr/tests/share/examples/tests/plain/Kyuafile
+OLD_FILES+=usr/tests/share/examples/tests/plain/cp_test
+OLD_FILES+=usr/tests/share/examples/tests/plain/printf_test
+OLD_FILES+=usr/tests/share/examples/tests/tap/Kyuafile
+OLD_FILES+=usr/tests/share/examples/tests/tap/cp_test
+OLD_FILES+=usr/tests/share/examples/tests/tap/printf_test
+OLD_FILES+=usr/tests/share/examples/tests/Kyuafile
OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
OLD_FILES+=usr/share/examples/uefisign/uefikeys
@@ -1993,6 +2013,12 @@ OLD_DIRS+=usr/share/examples/sunrpc/sort
OLD_DIRS+=usr/share/examples/tcsh
OLD_DIRS+=usr/share/examples/uefisign
OLD_DIRS+=usr/share/examples/ypldap
+OLD_DIRS+=usr/tests/share/examples/tests/atf
+OLD_DIRS+=usr/tests/share/examples/tests/plain
+OLD_DIRS+=usr/tests/share/examples/tests/googletest
+OLD_DIRS+=usr/tests/share/examples/tests/tap
+OLD_DIRS+=usr/tests/share/examples/tests
+OLD_DIRS+=usr/tests/share/examples
.endif
.if ${MK_FDT} == no