Skip to content

Commit cf17b4e

Browse files
committed
ci: cleanup linux skips for headers up to 6.5.0
Signed-off-by: Pedro Tammela <[email protected]>
1 parent 812f982 commit cf17b4e

File tree

1 file changed

+9
-44
lines changed

1 file changed

+9
-44
lines changed

libc-test/build.rs

+9-44
Original file line numberDiff line numberDiff line change
@@ -4180,6 +4180,14 @@ fn test_linux(target: &str) {
41804180
|| name == "FAN_RESPONSE_INFO_NONE"
41814181
|| name == "FAN_RESPONSE_INFO_AUDIT_RULE"
41824182
|| name == "FAN_INFO"
4183+
|| name == "FAN_MARK_IGNORE"
4184+
|| name == "FAN_MARK_IGNORE_SURV"
4185+
{
4186+
return true;
4187+
}
4188+
// FIXME(musl): Not in musl yet
4189+
if name == "IPPROTO_MPTCP"
4190+
|| name == "IPPROTO_ETHERNET"
41834191
{
41844192
return true;
41854193
}
@@ -4237,9 +4245,7 @@ fn test_linux(target: &str) {
42374245
"VMADDR_CID_RESERVED" => true,
42384246

42394247
// IPPROTO_MAX was increased in 5.6 for IPPROTO_MPTCP:
4240-
| "IPPROTO_MAX"
4241-
| "IPPROTO_ETHERNET"
4242-
| "IPPROTO_MPTCP" => true,
4248+
"IPPROTO_MAX" => true,
42434249

42444250
// FIXME(linux): Not yet implemented on sparc64
42454251
"SYS_clone3" if sparc64 => true,
@@ -4272,53 +4278,15 @@ fn test_linux(target: &str) {
42724278
// is a private value for kernel usage normally
42734279
"FUSE_SUPER_MAGIC" => true,
42744280

4275-
// Added in linux 6.1
4276-
"STATX_DIOALIGN"
4277-
| "CAN_RAW_XL_FRAMES"
4278-
| "CANXL_HDR_SIZE"
4279-
| "CANXL_MAX_DLC"
4280-
| "CANXL_MAX_DLC_MASK"
4281-
| "CANXL_MAX_DLEN"
4282-
| "CANXL_MAX_MTU"
4283-
| "CANXL_MIN_DLC"
4284-
| "CANXL_MIN_DLEN"
4285-
| "CANXL_MIN_MTU"
4286-
| "CANXL_MTU"
4287-
| "CANXL_PRIO_BITS"
4288-
| "CANXL_PRIO_MASK"
4289-
| "CANXL_SEC"
4290-
| "CANXL_XLF"
4291-
=> true,
4292-
42934281
// FIXME(linux): The below is no longer const in glibc 2.34:
42944282
// https://github.com/bminor/glibc/commit/5d98a7dae955bafa6740c26eaba9c86060ae0344
42954283
| "PTHREAD_STACK_MIN"
42964284
| "SIGSTKSZ"
42974285
| "MINSIGSTKSZ"
42984286
if gnu => true,
42994287

4300-
// FIXME(linux): Requires >= 6.3 kernel headers
4301-
"MFD_EXEC" | "MFD_NOEXEC_SEAL" if sparc64 => true,
4302-
4303-
// kernel 6.1 minimum
4304-
"MADV_COLLAPSE" => true,
4305-
4306-
// kernel 6.2 minimum
4307-
"TUN_F_USO4" | "TUN_F_USO6" | "IFF_NO_CARRIER" => true,
4308-
4309-
// FIXME(linux): Requires more recent kernel headers
4310-
"IFLA_ALLMULTI" // linux v6.0+
4311-
=> true,
4312-
43134288
// kernel 6.5 minimum
43144289
"MOVE_MOUNT_BENEATH" => true,
4315-
// FIXME(linux): Requires linux 6.1
4316-
"ALG_SET_KEY_BY_KEY_SERIAL" | "ALG_SET_DRBG_ENTROPY" => true,
4317-
4318-
// FIXME(linux): Requires more recent kernel headers
4319-
| "FAN_MARK_IGNORE" // linux v6.0+
4320-
| "FAN_MARK_IGNORE_SURV" // linux v6.0+
4321-
=> true,
43224290

43234291
// musl doesn't use <linux/fanotify.h> in <sys/fanotify.h>
43244292
"FAN_REPORT_PIDFD"
@@ -4402,9 +4370,6 @@ fn test_linux(target: &str) {
44024370
// FIXME(linux): Requires >= 6.11 kernel headers.
44034371
"MAP_DROPPABLE" => true,
44044372

4405-
// FIXME(linux): Requires >= 6.2 kernel headers.
4406-
"SOF_TIMESTAMPING_OPT_ID_TCP" => true,
4407-
44084373
// FIXME(linux): Requires >= 6.12 kernel headers.
44094374
"SOF_TIMESTAMPING_OPT_RX_FILTER" => true,
44104375

0 commit comments

Comments
 (0)