Re: git: 912864912b71 - main - Run `make obj` before running `make test-includes`

On Mon, Mar 2, 2026, 11:00 PM Enji Cooper <ngie@freebsd.org> wrote:

> The branch main has been updated by ngie:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=912864912b71951f9a636190b1dba80528f588eb
>
> commit 912864912b71951f9a636190b1dba80528f588eb
> Author:     Enji Cooper <ngie@FreeBSD.org>
> AuthorDate: 2026-03-03 05:59:50 +0000
> Commit:     Enji Cooper <ngie@FreeBSD.org>
> CommitDate: 2026-03-03 05:59:56 +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`.
>

I've never seen this happen. .OBJDIR is created automatically for me always
for the last 5 years... I run buildworld all the time. Can you explain when
/  how it happens more specifically or back out the change?

Warner

    MFC after:      1 week
>     Differential Revision: https://reviews.freebsd.org/D55499
> ---
>  Makefile.inc1 | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.inc1 b/Makefile.inc1
> index 93c54e0a0d14..c4696abae8cd 100644
> --- a/Makefile.inc1
> +++ b/Makefile.inc1
> @@ -1207,7 +1207,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
> "--------------------------------------------------------------"
> @@ -1575,6 +1575,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
>
>