Date: Fri, 26 Jun 2026 16:59:36 +0000 From: Siva Mahadevan <siva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ae7241e7d08b - stable/14 - tests/ktest_netlink_message_writer: remove INVARIANTS requirement Message-ID: <6a3eaff8.35e42.4ec59b64@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=ae7241e7d08b2193b0370d16b3d8b6a82423d9ef commit ae7241e7d08b2193b0370d16b3d8b6a82423d9ef Author: Siva Mahadevan <siva@FreeBSD.org> AuthorDate: 2026-01-22 19:49:51 +0000 Commit: Siva Mahadevan <siva@FreeBSD.org> CommitDate: 2026-06-26 15:28:18 +0000 tests/ktest_netlink_message_writer: remove INVARIANTS requirement INVARIANTS is meant to be used to enable extra sanity checking for internal structures, not enable/disable tests in the freebsd kyua test suite. STABLE branches include a GENERIC kernconf without INVARIANTS, so ktest_netlink_message_writer is broken on such branches: https://ci.freebsd.org/job/FreeBSD-stable-15-amd64-test/253/testReport/sys.netlink.test_netlink_message_writer/py/__test_cases_list__/ Reviewed by: lwhsu, imp Approved by: lwhsu (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1889 MFC after: 3 days Signed-off-by: Siva Mahadevan <siva@FreeBSD.org> Sponsored by: The FreeBSD Foundation (cherry picked from commit 8352e24d0bc59f9730980986600bde7d8cdce21d) --- sys/netlink/ktest_netlink_message_writer.c | 5 ----- sys/netlink/ktest_netlink_message_writer.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c index e46065dd4bd2..4f894d5e070a 100644 --- a/sys/netlink/ktest_netlink_message_writer.c +++ b/sys/netlink/ktest_netlink_message_writer.c @@ -37,8 +37,6 @@ #define KTEST_CALLER #include <netlink/ktest_netlink_message_writer.h> -#ifdef INVARIANTS - struct test_mbuf_attrs { uint32_t size; uint32_t expected_avail; @@ -146,10 +144,8 @@ test_mbuf_chain_allocation(struct ktest_test_context *ctx) return (0); } -#endif static const struct ktest_test_info tests[] = { -#ifdef INVARIANTS { .name = "test_mbuf_writer_allocation", .desc = "test different mbuf sizes in the mbuf writer", @@ -162,6 +158,5 @@ static const struct ktest_test_info tests[] = { .func = &test_mbuf_chain_allocation, .parse = &test_mbuf_parser, }, -#endif }; KTEST_MODULE_DECLARE(ktest_netlink_message_writer, tests); diff --git a/sys/netlink/ktest_netlink_message_writer.h b/sys/netlink/ktest_netlink_message_writer.h index b7864bea59c9..8a4c4c481d18 100644 --- a/sys/netlink/ktest_netlink_message_writer.h +++ b/sys/netlink/ktest_netlink_message_writer.h @@ -28,7 +28,7 @@ #ifndef _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ #define _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ -#if defined(_KERNEL) && defined(INVARIANTS) +#if defined(_KERNEL) bool nlmsg_get_buf_type_wrapper(struct nl_writer *nw, int size, int type, bool waitok); void nlmsg_set_callback_wrapper(struct nl_writer *nw);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3eaff8.35e42.4ec59b64>