The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=cea2683bb691d6cbcfb7e342c497d018bba712c2
commit cea2683bb691d6cbcfb7e342c497d018bba712c2 Author: Enji Cooper <[email protected]> AuthorDate: 2026-02-01 17:12:44 +0000 Commit: Enji Cooper <[email protected]> CommitDate: 2026-02-01 17:12:44 +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 --- 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 1cf8b44eaca3..a0d3cf902337 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1922,6 +1922,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 @@ -1989,6 +2009,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
