git: d80ab37f9883 - main - test-includes: Make sure we test against in-tree headers

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Thu, 10 Apr 2025 12:47:18 UTC
The branch main has been updated by markj:

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

commit d80ab37f9883cb981c9b359d50bbfe8f0d6f2884
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-04-10 12:42:42 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-04-10 12:47:00 +0000

    test-includes: Make sure we test against in-tree headers
    
    Regenerate badfiles.inc as well.
    
    Reviewed by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D49736
---
 tools/build/test-includes/Makefile     |  3 +++
 tools/build/test-includes/badfiles.inc | 17 -----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/tools/build/test-includes/Makefile b/tools/build/test-includes/Makefile
index 2c25e0fb32ce..5c45fd7daa4f 100644
--- a/tools/build/test-includes/Makefile
+++ b/tools/build/test-includes/Makefile
@@ -26,6 +26,9 @@ CFLAGS.event.c=	-D_WANT_KEVENT32 -D_WANT_FREEBSD11_KEVENT
 # details like __inline that the header files must follow to support C89.
 CFLAGS+=-ansi
 
+# Make sure we're pulling in headers from the src tree.
+CFLAGS+=-I${SRCTOP}/sys
+
 .include "badfiles.inc"
 
 .for h c in ${HDRS:@x@$x ${x:S,/,_,g:R}.c@}
diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc
index 1e5182e40911..2ed61c32aa4e 100644
--- a/tools/build/test-includes/badfiles.inc
+++ b/tools/build/test-includes/badfiles.inc
@@ -65,11 +65,8 @@ BADHDRS= \
 	sys/kobj.h \
 	sys/ksem.h \
 	sys/ktls.h \
-	sys/ktrace.h \
 	sys/libkern.h \
 	sys/link_aout.h \
-	sys/linker.h \
-	sys/linker_set.h \
 	sys/lock.h \
 	sys/lock_profile.h \
 	sys/lockf.h \
@@ -77,7 +74,6 @@ BADHDRS= \
 	sys/loginclass.h \
 	sys/mbuf.h \
 	sys/md4.h \
-	sys/md5.h \
 	sys/mdioctl.h \
 	sys/memdesc.h \
 	sys/memrange.h \
@@ -85,7 +81,6 @@ BADHDRS= \
 	sys/module_khelp.h \
 	sys/mpt_ioctl.h \
 	sys/msgbuf.h \
-	sys/mutex.h \
 	sys/namei.h \
 	sys/osd.h \
 	sys/pciio.h \
@@ -106,7 +101,6 @@ BADHDRS= \
 	sys/runq.h \
 	sys/rwlock.h \
 	sys/sbuf.h \
-	sys/sema.h \
 	sys/sf_buf.h \
 	sys/sglist.h \
 	sys/sigio.h \
@@ -117,10 +111,8 @@ BADHDRS= \
 	sys/sockopt.h \
 	sys/stack.h \
 	sys/stats.h \
-	sys/sx.h \
 	sys/syscallsubr.h \
 	sys/syslimits.h \
-	sys/systm.h \
 	sys/taskqueue.h \
 	sys/terminal.h \
 	sys/termios.h \
@@ -155,13 +147,11 @@ BADHDRS= \
 	net/if_llc.h \
 	net/if_media.h \
 	net/if_mib.h \
-	net/if_pfsync.h \
 	net/if_tap.h \
 	net/if_tun.h \
 	net/if_var.h \
 	net/if_vlan_var.h \
 	net/iflib.h \
-	net/iflib_private.h \
 	net/ifq.h \
 	net/mp_ring.h \
 	net/mppc.h \
@@ -172,9 +162,7 @@ BADHDRS= \
 	net/paravirt.h \
 	net/pfil.h \
 	net/pfkeyv2.h \
-	net/pfvar.h \
 	net/radix.h \
-	net/raw_cb.h \
 	net/rndis.h \
 	net/route.h \
 	net/rss_config.h \
@@ -258,7 +246,6 @@ BADHDRS= \
 	netinet/in_rss.h \
 	netinet/in_systm.h \
 	netinet/in_var.h \
-	netinet/ip.h \
 	netinet/ip6.h \
 	netinet/ip_carp.h \
 	netinet/ip_dummynet.h \
@@ -275,13 +262,11 @@ BADHDRS= \
 	netinet/sctp_pcb.h \
 	netinet/sctp_structs.h \
 	netinet/sctp_sysctl.h \
-	netinet/tcp_debug.h \
 	netinet/tcp_hpts.h \
 	netinet/tcp_log_buf.h \
 	netinet/tcp_lro.h \
 	netinet/tcp_offload.h \
 	netinet/tcp_ratelimit.h \
-	netinet/tcp_var.h \
 	netinet/tcpip.h \
 	netinet/toecore.h \
 	netinet/udplite.h \
@@ -293,7 +278,6 @@ BADHDRS= \
 	netinet6/ip6.h \
 	netinet6/ip6_mroute.h \
 	netinet6/ip6_var.h \
-	netinet6/ip6protosw.h \
 	netinet6/ip_fw_nat64.h \
 	netinet6/ip_fw_nptv6.h \
 	netinet6/mld6.h \
@@ -313,7 +297,6 @@ BADHDRS= \
 	netipsec/ipsec6.h \
 	netipsec/key_debug.h \
 	netipsec/keysock.h \
-	netipsec/xform.h \
 	netsmb/netbios.h \
 	netsmb/smb.h \
 	netsmb/smb_conn.h \