FreeBSD/src a97842b — . Makefile.inc1

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)
DeltaFile
+2-1Makefile.inc1
+2-11 files

FreeBSD/src 85b9947 — libexec/tftpd/tests functional.c

tftpd tests: clean trailing whitespace

No functional change intended.

MFC after:      1 week

(cherry picked from commit fd6217075e6a5926bdc627145b38194b6c5ba8da)
DeltaFile
+9-9libexec/tftpd/tests/functional.c
+9-91 files

FreeBSD/src c452b66 — contrib/netbsd-tests/lib/libc/c063 t_fchmodat.c t_mkfifoat.c

contrib/netbsd-tests: lib/libc/c063: sync with NetBSD

This change syncs the lib/libc/c063 NetBSD tests with FreeBSD. This does
two things:
- Addresses bogus tautologically true assertions flagged by clang and gcc
  with ATF 0.22+ [1].
- Brings in some new test coverage.

Obtained from:  NetBSD (date tag: `20260818UTC`)
MFC after:      2 weeks
1. https://github.com/freebsd/atf/pull/72

(cherry picked from commit 8109a5c0fba0d015354a69b40e6682d5e8c0f638)
DeltaFile
+89-59contrib/netbsd-tests/lib/libc/c063/t_utimensat.c
+69-4contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
+29-2contrib/netbsd-tests/lib/libc/c063/t_mkfifoat.c
+11-6contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
+198-714 files

FreeBSD/src 4e17a6f — tests/sys/netinet tcp_implied_connect.c

tests/sys/netinet/tcp_socket: fix build with ATF 0.22+

Confirm that creating clients/sockets was successful by testing the
result separate from the assignment and test that the return value is
not -1 instead of testing that the value returned is non-zero.

This fixes the build with [ATF 0.22+][1].

MFC after:      2 weeks
Reported by:    clang (-Wparenthesis)
Reviewed by:    tuexen, cc
Differential Revision:  https://reviews.freebsd.org/D59284
[1]: https://github.com/freebsd/atf/pull/72

Conflicts:
        tests/sys/netinet/tcp_implied_connect.c

(cherry picked from commit 4aea6ea2eb400737837ff8d22c25688f88c7966c)
DeltaFile
+4-2tests/sys/netinet/tcp_implied_connect.c
+4-21 files

FreeBSD/src 2c08d7b — contrib/atf/atf-sh integration_test.sh

integration_test: backport fix from freebsd/atf

See the related merge commit for more details.

MFC after:      28 days
Obtained from:  [freebsd/atf at 2690b04c][upstream]
Fixes:          95223108 ("contrib/atf: upgrade to 0.26")

Merge commit '8fd09407c8e64fd26d095c9b00990c545577db5a'

[upstream]: https://github.com/freebsd/atf/commit/2690b04cbc608af165a58426b7275c063b779f03

(cherry picked from commit 8d94a93d967bbb985813aa5561c823ab5f75bb73)
DeltaFile
+1-1contrib/atf/atf-sh/integration_test.sh
+1-11 files

FreeBSD/src a069152 — contrib/atf config.h NEWS, contrib/atf/atf-c++/detail auto_array.hpp auto_array_test.cpp

contrib/atf: upgrade to 0.26

This new version gets contrib/atf in line with the published version of
the package up on [GitHub][github].

Please note that this release is a major update: it contains several
bugfixes and feature enhancements. Most were already present in the
FreeBSD src repo, but there were a large number of changes made in
addition to what was already present.

MFC after:      1 month

Merge commit '9c78088348bcf1059d82a62bb57a0746309d4312'

Conflicts:
        ObsoleteFiles.inc
        contrib/atf/.cirrus.yml
        contrib/atf/Makefile.am
        contrib/atf/Makefile.in

    [53 lines not shown]
DeltaFile
+0-336contrib/atf/doc/atf-test-case.4
+328-0contrib/atf/doc/atf-test-case.7
+0-302contrib/atf/atf-c++/detail/auto_array_test.cpp
+147-53contrib/atf/NEWS
+0-175contrib/atf/atf-c++/detail/auto_array.hpp
+115-17contrib/atf/config.h
+590-88370 files not shown
+1,275-1,54176 files

FreeBSD/src 9f1f9b9 — contrib/atf/atf-c atf-c.3

atf-c(3): bump .Dd for the content change

MFC after:      2 weeks
MFC with:       a14573de29de

(cherry picked from commit 2a678ff8907fa0197e65bd9b9f0e4b5a3b236b20)
DeltaFile
+1-1contrib/atf/atf-c/atf-c.3
+1-11 files

FreeBSD/src ef7f64b — contrib/lutok Makefile.in aclocal.m4, contrib/lutok/admin config.sub ltmain.sh

contrib/lutok: remove autotools generated files

These files provide no value in the FreeBSD tree proper and change
frequently, depending on what machine I generate the release tarball on
(and what versions of autotools are on the host). Nuke the autogenerated
files to avoid bloating commit history/the tree.

MFC after:      3 days
Requested by:   Benjamin Jacobs <freebsd at dev.thsi.be>

(cherry picked from commit cfe443e1e63dd588fba7eabec553ed5e1c408d1f)
DeltaFile
+0-23,387contrib/lutok/configure
+0-11,524contrib/lutok/admin/ltmain.sh
+0-8,488contrib/lutok/m4/libtool.m4
+0-1,802contrib/lutok/admin/config.sub
+0-1,733contrib/lutok/aclocal.m4
+0-1,574contrib/lutok/Makefile.in
+0-48,5089 files not shown
+0-52,77715 files

FreeBSD/src d6cf497 — contrib/lutok Makefile.in aclocal.m4, contrib/lutok/admin config.sub ltmain.sh

contrib/lutok: update from 0.4 to 0.6.2

More information about what's included in the new release can be found
[here](https://github.com/freebsd/lutok/compare/lutok-0.4...lutok-0.6.2).

MFC after:      1 week
Merge commit '447d4fe61d8bf55ffa21698ecee0ac51010a9a0f'

(cherry picked from commit 132f818ddbf457ee67d502cd89b5a18e0a34713d)
DeltaFile
+23,387-0contrib/lutok/configure
+11,524-0contrib/lutok/admin/ltmain.sh
+8,488-0contrib/lutok/m4/libtool.m4
+1,802-0contrib/lutok/admin/config.sub
+1,733-0contrib/lutok/aclocal.m4
+1,574-0contrib/lutok/Makefile.in
+48,508-09 files not shown
+52,777-015 files

FreeBSD/src d728be0 — lib/libsbuf/tests sbuf_string_test.c sbuf_stdio_test.c

sbuf(3): clean up tests

- Update the copyright dates and add "Joao Bonifacio" to the top of
  `sbuf_core_test.c`.
- Use `SPDX-Identifier` instead of longform copyright tort.
- Remove `sbuf_test_common.h`: the header was originally added to help
  with the 10.x/11.x split, but is no longer needed given that those
  releases have been EOLed for multiple years now.

MFC after:      1 week

(cherry picked from commit 3593be37a49e3f5268259bcc2af58cf730b08335)
DeltaFile
+4-37lib/libsbuf/tests/sbuf_core_test.c
+0-37lib/libsbuf/tests/sbuf_test_common.h
+2-23lib/libsbuf/tests/sbuf_string_test.c
+2-23lib/libsbuf/tests/sbuf_stdio_test.c
+8-1204 files

FreeBSD/src 8f6b692 — lib/libsbuf/tests sbuf_core_test.c

sbuf(3): increase test coverage

This change adds additional explicit test coverage for the following
sbuf(3) APIs:
- sbuf_clear_flags
- sbuf_get_flags
- sbuf_set_flags

While here, add a missing `sbuf_delete` to `sbuf_drain_ret0_test`: while
it isn't strictly required (the library's state is cleaned up shortly
after the test process ends), tools such as Coverity and LSAN flag
issues with leaked memory. Adding the sbuf_delete(3) call to the test
quells that issue.

MFC after:      1 week
Reviewed-by:    ngie
Pull-Request:   https://github.com/freebsd/freebsd-src/pull/2367

(cherry picked from commit 642b3d965eb6ef3ecf733950e66fad565a27c967)
DeltaFile
+77-10lib/libsbuf/tests/sbuf_core_test.c
+77-101 files

FreeBSD/src 5ab6177 — lib/libsbuf/tests sbuf_string_test.c sbuf_stdio_test.c

sbuf(3): clean up tests

- Update the copyright dates and add "Joao Bonifacio" to the top of
  `sbuf_core_test.c`.
- Use `SPDX-Identifier` instead of longform copyright tort.
- Remove `sbuf_test_common.h`: the header was originally added to help
  with the 10.x/11.x split, but is no longer needed given that those
  releases have been EOLed for multiple years now.

MFC after:      1 week

(cherry picked from commit 3593be37a49e3f5268259bcc2af58cf730b08335)
DeltaFile
+4-37lib/libsbuf/tests/sbuf_core_test.c
+0-37lib/libsbuf/tests/sbuf_test_common.h
+2-23lib/libsbuf/tests/sbuf_string_test.c
+2-23lib/libsbuf/tests/sbuf_stdio_test.c
+8-1204 files

FreeBSD/src f5b2ad7 — lib/libsbuf/tests sbuf_core_test.c

sbuf(3): increase test coverage

This change adds additional explicit test coverage for the following
sbuf(3) APIs:
- sbuf_clear_flags
- sbuf_get_flags
- sbuf_set_flags

While here, add a missing `sbuf_delete` to `sbuf_drain_ret0_test`: while
it isn't strictly required (the library's state is cleaned up shortly
after the test process ends), tools such as Coverity and LSAN flag
issues with leaked memory. Adding the sbuf_delete(3) call to the test
quells that issue.

MFC after:      1 week
Reviewed-by:    ngie
Pull-Request:   https://github.com/freebsd/freebsd-src/pull/2367

(cherry picked from commit 642b3d965eb6ef3ecf733950e66fad565a27c967)
DeltaFile
+77-10lib/libsbuf/tests/sbuf_core_test.c
+77-101 files

FreeBSD/src 3f5d571 — contrib/lutok Makefile.in aclocal.m4, contrib/lutok/admin config.sub ltmain.sh

contrib/lutok: remove autotools generated files

These files provide no value in the FreeBSD tree proper and change
frequently, depending on what machine I generate the release tarball on
(and what versions of autotools are on the host). Nuke the autogenerated
files to avoid bloating commit history/the tree.

MFC after:      3 days
Requested by:   Benjamin Jacobs <freebsd at dev.thsi.be>

(cherry picked from commit cfe443e1e63dd588fba7eabec553ed5e1c408d1f)
DeltaFile
+0-23,387contrib/lutok/configure
+0-11,524contrib/lutok/admin/ltmain.sh
+0-8,488contrib/lutok/m4/libtool.m4
+0-1,802contrib/lutok/admin/config.sub
+0-1,733contrib/lutok/aclocal.m4
+0-1,574contrib/lutok/Makefile.in
+0-48,5089 files not shown
+0-52,77715 files

FreeBSD/src 3230b32 — contrib/lutok Makefile.in aclocal.m4, contrib/lutok/admin config.sub ltmain.sh

contrib/lutok: update from 0.4 to 0.6.2

More information about what's included in the new release can be found
[here](https://github.com/freebsd/lutok/compare/lutok-0.4...lutok-0.6.2).

MFC after:      1 week
Merge commit '447d4fe61d8bf55ffa21698ecee0ac51010a9a0f'

(cherry picked from commit 132f818ddbf457ee67d502cd89b5a18e0a34713d)
DeltaFile
+23,387-0contrib/lutok/configure
+11,524-0contrib/lutok/admin/ltmain.sh
+8,488-0contrib/lutok/m4/libtool.m4
+1,802-0contrib/lutok/admin/config.sub
+1,733-0contrib/lutok/aclocal.m4
+1,574-0contrib/lutok/Makefile.in
+48,508-09 files not shown
+52,777-015 files

FreeBSD/src 889727e — contrib/atf/atf-sh integration_test.sh

integration_test: backport fix from freebsd/atf

See the related merge commit for more details.

MFC after:      28 days
Obtained from:  [freebsd/atf at 2690b04c][upstream]
Fixes:          95223108 ("contrib/atf: upgrade to 0.26")

Merge commit '8fd09407c8e64fd26d095c9b00990c545577db5a'

[upstream]: https://github.com/freebsd/atf/commit/2690b04cbc608af165a58426b7275c063b779f03

(cherry picked from commit 8d94a93d967bbb985813aa5561c823ab5f75bb73)
DeltaFile
+1-1contrib/atf/atf-sh/integration_test.sh
+1-11 files

FreeBSD/src 040ab05 — contrib/atf config.h NEWS, contrib/atf/atf-c++/detail auto_array.hpp auto_array_test.cpp

contrib/atf: upgrade to 0.26

This new version gets contrib/atf in line with the published version of
the package up on [GitHub][github].

Please note that this release is a major update: it contains several
bugfixes and feature enhancements. Most were already present in the
FreeBSD src repo, but there were a large number of changes made in
addition to what was already present.

MFC after:      1 month

Merge commit '9c78088348bcf1059d82a62bb57a0746309d4312'

(cherry picked from commit 952231086100bed7130212b5425e44ffd732913b)

[github]: https://github.com/freebsd/atf
DeltaFile
+0-336contrib/atf/doc/atf-test-case.4
+328-0contrib/atf/doc/atf-test-case.7
+0-302contrib/atf/atf-c++/detail/auto_array_test.cpp
+147-53contrib/atf/NEWS
+0-175contrib/atf/atf-c++/detail/auto_array.hpp
+115-17contrib/atf/config.h
+590-88370 files not shown
+1,264-1,53476 files

FreeBSD/src a4f1d26 — lib/libc/tests/sys Makefile

tests/libc: only build brk_test where libc provides sbrk

Replace the exclusion list with an allowlist of the architectures
whose libc exports brk/sbrk: amd64, i386, arm and powerpc.

On aarch64, riscv and loongarch libc does not export those symbols
and the test cannot run, so do not build it there. New architectures
now default to not building the test unless brk support is added.

MFC after:      1 week
Signed-off-by:  Xiaoqiang Zhao <zhaoxiaoqiang007 at gmail.com>
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D60357

(cherry picked from commit 8a7df6c58d549bd2eaa5cad30b2ef93c3eca3c18)
DeltaFile
+2-1lib/libc/tests/sys/Makefile
+2-11 files

FreeBSD/src 36f49ae — share/man/man9 acl.9

acl(9): expound on NFSv4 constants' meanings

This change adds missing documentation for various NFSv4 constants
supported by acl(9).

Bump `.Dd` for the change.

MFC after:      1 week
Reviewed by:    rmacklem
Differential Revision:  https://reviews.freebsd.org/D58736

(cherry picked from commit 7a48c3fd3e6ea097a8fa8f3ce3e25fe7c2d37d9e)
DeltaFile
+18-1share/man/man9/acl.9
+18-11 files

FreeBSD/src b165ec5 — sys/compat/linuxkpi/common/src linux_firmware.c

LinuxKPI: firmware: remove `enoentok` logic in `*firmware_request(..)`

Prior to this change, in the event that a firmware module could not be
loaded, the linux_firmware driver would return a partially initialized
structure with uninitialized/zeroed out values for certain fields. Linux
does not do this, however, so some drivers that use
`request_firmware_nowait` expecting Linux behavior, like `if_bcrmfmac`,
would crash trying to dereference a NULL pointer.

This doesn't address the load/unload situation completely as the driver
remains loaded after the "firmware crashes", but it makes a completely
unusable situation (a kernel panic) into a slightly more usable situation
(driver does not unload).

As a sidenote: the raw free(9) call was replaced with a call to
`linuxkpi_release_firmware` because the latter call [better] ensures
that all resources allocated earlier on in the function are cleaned up.

MFC after:      1 weeks

    [4 lines not shown]
DeltaFile
+7-12sys/compat/linuxkpi/common/src/linux_firmware.c
+7-121 files

FreeBSD/src 52be6e2 — share/man/man9 acl.9

acl(9): expound on NFSv4 constants' meanings

This change adds missing documentation for various NFSv4 constants
supported by acl(9).

Bump `.Dd` for the change.

MFC after:      1 week
Reviewed by:    rmacklem
Differential Revision:  https://reviews.freebsd.org/D58736

(cherry picked from commit 7a48c3fd3e6ea097a8fa8f3ce3e25fe7c2d37d9e)
DeltaFile
+18-1share/man/man9/acl.9
+18-11 files

FreeBSD/src e4679ca — sys/compat/linuxkpi/common/src linux_firmware.c

LinuxKPI: firmware: remove `enoentok` logic in `*firmware_request(..)`

Prior to this change, in the event that a firmware module could not be
loaded, the linux_firmware driver would return a partially initialized
structure with uninitialized/zeroed out values for certain fields. Linux
does not do this, however, so some drivers that use
`request_firmware_nowait` expecting Linux behavior, like `if_bcrmfmac`,
would crash trying to dereference a NULL pointer.

This doesn't address the load/unload situation completely as the driver
remains loaded after the "firmware crashes", but it makes a completely
unusable situation (a kernel panic) into a slightly more usable situation
(driver does not unload).

As a sidenote: the raw free(9) call was replaced with a call to
`linuxkpi_release_firmware` because the latter call [better] ensures
that all resources allocated earlier on in the function are cleaned up.

MFC after:      1 weeks

    [4 lines not shown]
DeltaFile
+7-12sys/compat/linuxkpi/common/src/linux_firmware.c
+7-121 files

FreeBSD/src 8957a03 — contrib/netbsd-tests/lib/libc/gen t_assert.c

[tests] lib/libc/gen:assert_test: undefine `NDEBUG`

In the event `NDEBUG` was defined, `assert` would become a no-op,
breaking some of the expectations in `assert_test` around `assert(..)`
failing generating a coredump.

This is a better approach than the previous one committed in 6f3445006a
as it continues to test the `assert(..)` function instead of just
skipping it if `NDEBUG` was defined.

Suggested by:   kevans
MFC after:      4 days
MFC with:       6f3445006a
Fixes:          6f3445006a
Differential Revision: https://reviews.freebsd.org/D60253

(cherry picked from commit 9d5a33d9c294b01cead6ff65b0773b5b5ab85ccd)
DeltaFile
+6-20contrib/netbsd-tests/lib/libc/gen/t_assert.c
+6-201 files

FreeBSD/src c88dd36 — contrib/netbsd-tests/lib/libc/gen t_assert.c

[tests] lib/libc/gen:assert_test: skip tests when NDEBUG set

In the event that NDEBUG is specified in CFLAGS--which is most likely
triggered via `MK_ASSERT_DEBUG` == "no" -- all assert(3) statements are
optimized out by design. This breaks the assert(3) tests as they
specifically rely on assert(3) actually raising a `SIGABRT` instead of
quietly succeeding.

Skip both tests if `NDEBUG` is set. There's no sense running the
`assert(true)` test if the result could instead be a false positive.

MFC after:      2 weeks

(cherry picked from commit 6f3445006aa05550f14af65b04276c3d25169941)
DeltaFile
+20-0contrib/netbsd-tests/lib/libc/gen/t_assert.c
+20-01 files

FreeBSD/src aafeb0e — contrib/netbsd-tests/lib/libc/gen t_assert.c

[tests] lib/libc/gen:assert_test: skip tests when NDEBUG set

In the event that NDEBUG is specified in CFLAGS--which is most likely
triggered via `MK_ASSERT_DEBUG` == "no" -- all assert(3) statements are
optimized out by design. This breaks the assert(3) tests as they
specifically rely on assert(3) actually raising a `SIGABRT` instead of
quietly succeeding.

Skip both tests if `NDEBUG` is set. There's no sense running the
`assert(true)` test if the result could instead be a false positive.

MFC after:      2 weeks

(cherry picked from commit 6f3445006aa05550f14af65b04276c3d25169941)
DeltaFile
+20-0contrib/netbsd-tests/lib/libc/gen/t_assert.c
+20-01 files

FreeBSD/src fe7fe52 — contrib/netbsd-tests/lib/libc/gen t_assert.c

[tests] lib/libc/gen:assert_test: undefine `NDEBUG`

In the event `NDEBUG` was defined, `assert` would become a no-op,
breaking some of the expectations in `assert_test` around `assert(..)`
failing generating a coredump.

This is a better approach than the previous one committed in 6f3445006a
as it continues to test the `assert(..)` function instead of just
skipping it if `NDEBUG` was defined.

Suggested by:   kevans
MFC after:      4 days
MFC with:       6f3445006a
Fixes:          6f3445006a
Differential Revision: https://reviews.freebsd.org/D60253

(cherry picked from commit 9d5a33d9c294b01cead6ff65b0773b5b5ab85ccd)
DeltaFile
+6-20contrib/netbsd-tests/lib/libc/gen/t_assert.c
+6-201 files

FreeBSD/src e4532b8 — share/mk bsd.confs.mk

share/mk/bsd.confs.mk: fix trivial typo in message

The error message noting that the file should not be included said
"bsd.conf.mk" before this change. Now it correctly says "bsd.confs.mk".

MFC after:      3 days

(cherry picked from commit a3214d4e9b661fb173fc25b06b7ee9902b0b57e3)
DeltaFile
+1-1share/mk/bsd.confs.mk
+1-11 files

FreeBSD/src a38180f — share/mk bsd.confs.mk

share/mk/bsd.confs.mk: fix trivial typo in message

The error message noting that the file should not be included said
"bsd.conf.mk" before this change. Now it correctly says "bsd.confs.mk".

MFC after:      3 days

(cherry picked from commit a3214d4e9b661fb173fc25b06b7ee9902b0b57e3)
DeltaFile
+1-1share/mk/bsd.confs.mk
+1-11 files

FreeBSD/src acc5475 — sys/arm/rockchip files.rk32xx

clk: add config(5) entry for `rk_clk_mmc.c`

This is needed in order to unbreak the build on armv7.

Reported by:    Jenkins
Fixes:          e32b082ba28b ("clk: rockchip: Add the MMC phase clock")
DeltaFile
+1-0sys/arm/rockchip/files.rk32xx
+1-01 files

FreeBSD/src 91fcc2d — contrib/atf FREEBSD-upgrade

atf/FREEBSD-upgrade: update document/rewrite in Markdown

The document does not reflect current reality with how updates/releases
should be managed with contrib/atf . Update it to a state that better
reflects current practices with git, as well as information about where
the latest version of the project can be found, etc.

This change will be used as a template for adding instructions on how to
update contrib/kyua and contrib/lutok in future commits.

MFC after:      1 month
Reviewed by:    ziaee, carlavilla
Differential Revision:  https://reviews.freebsd.org/D59879
DeltaFile
+81-32contrib/atf/FREEBSD-upgrade
+81-321 files