Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2026 16:22:39 +0000
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: a826f61110e6 - stable/15 - Run `make obj` before running `make test-includes`
Message-ID:  <69ecea4f.44b6c.73d76a65@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=a826f61110e69f1d6eaa1ec06885e16a7a79c1cc

commit a826f61110e69f1d6eaa1ec06885e16a7a79c1cc
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-03-03 05:59:50 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-04-25 16:22:33 +0000

    Run `make obj` before running `make test-includes`
    
    Before this change, `make test-includes` (run as part of buildworld)
    would place test files in the current directory, which would clutter up
    git clones. Run `make obj` beforehand to ensure that the files are put
    in `${.OBJDIR}` instead of `${.CURDIR}`. This helps cut down on the
    noise significantly when running commands like `git status`.
    
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D55499
    
    (cherry picked from commit 912864912b71951f9a636190b1dba80528f588eb)
---
 Makefile.inc1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8d8d8cbfe931..2255b61a30ff 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1208,7 +1208,7 @@ _includes:
 .if !empty(SUBDIR_OVERRIDE) && make(buildworld)
 	${_+_}cd ${.CURDIR}; ${WMAKE} MK_INCLUDES=yes SHARED=symlinks includes
 .endif
-	${_+_}cd ${.CURDIR};  ${WMAKE} test-includes
+	${_+_}cd ${.CURDIR}; ${WMAKE} test-includes
 _libraries:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1576,6 +1576,7 @@ makeman: .PHONY
 # Ensure no regressions in self-includeability of sys/*.h and net*/*.h
 test-includes: .PHONY
 	${_+_}cd ${.CURDIR}/tools/build/test-includes; \
+	    ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} obj; \
 	    ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} DESTDIR=${WORLDTMP} test-includes
 
 # We can't assume here that ${TMPPATH} will include ${PATH} or /usr/libexec


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ecea4f.44b6c.73d76a65>