Skip to content

Commit 969d956

Browse files
committed
test: linux: Unskip some types that now pass
Unskip a number of types and constants that were added in more recent kernel versions but are now available in our CI setup.
1 parent 488022e commit 969d956

File tree

1 file changed

+18
-51
lines changed

1 file changed

+18
-51
lines changed

libc-test/build.rs

Lines changed: 18 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3997,13 +3997,6 @@ fn test_linux(target: &str) {
39973997
"sctp_initmsg" | "sctp_sndrcvinfo" | "sctp_sndinfo" | "sctp_rcvinfo"
39983998
| "sctp_nxtinfo" | "sctp_prinfo" | "sctp_authinfo" => true,
39993999

4000-
// FIXME(linux): requires >= 6.1 kernel headers
4001-
"canxl_frame" => true,
4002-
4003-
// FIXME(linux): The size of `iv` has been changed since Linux v6.0
4004-
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
4005-
"af_alg_iv" => true,
4006-
40074000
// FIXME(linux): Requires >= 5.1 kernel headers.
40084001
// Everything that uses install-musl.sh has 4.19 kernel headers.
40094002
"tls12_crypto_info_aes_gcm_256"
@@ -4356,43 +4349,21 @@ fn test_linux(target: &str) {
43564349
// is a private value for kernel usage normally
43574350
"FUSE_SUPER_MAGIC" => true,
43584351

4359-
// linux 5.17 min
4360-
"PR_SET_VMA" | "PR_SET_VMA_ANON_NAME" => true,
4361-
4362-
// present in recent kernels only
4363-
"PR_SCHED_CORE" | "PR_SCHED_CORE_CREATE" | "PR_SCHED_CORE_GET" | "PR_SCHED_CORE_MAX" | "PR_SCHED_CORE_SCOPE_PROCESS_GROUP" | "PR_SCHED_CORE_SCOPE_THREAD" | "PR_SCHED_CORE_SCOPE_THREAD_GROUP" | "PR_SCHED_CORE_SHARE_FROM" | "PR_SCHED_CORE_SHARE_TO" => true,
4364-
4365-
// present in recent kernels only >= 5.13
4366-
"PR_PAC_SET_ENABLED_KEYS" | "PR_PAC_GET_ENABLED_KEYS" => true,
4367-
// present in recent kernels only >= 5.19
4368-
"PR_SME_SET_VL" | "PR_SME_GET_VL" | "PR_SME_VL_LEN_MAX" | "PR_SME_SET_VL_INHERIT" | "PR_SME_SET_VL_ONE_EXEC" => true,
4369-
4370-
// Added in Linux 5.14
4371-
"FUTEX_LOCK_PI2" => true,
4372-
4373-
// Added in linux 6.1
4374-
"STATX_DIOALIGN"
4375-
| "CAN_RAW_XL_FRAMES"
4376-
| "CANXL_HDR_SIZE"
4377-
| "CANXL_MAX_DLC"
4378-
| "CANXL_MAX_DLC_MASK"
4379-
| "CANXL_MAX_DLEN"
4380-
| "CANXL_MAX_MTU"
4381-
| "CANXL_MIN_DLC"
4382-
| "CANXL_MIN_DLEN"
4383-
| "CANXL_MIN_MTU"
4384-
| "CANXL_MTU"
4385-
| "CANXL_PRIO_BITS"
4386-
| "CANXL_PRIO_MASK"
4387-
| "CANXL_SEC"
4388-
| "CANXL_XLF"
4389-
=> true,
4390-
4391-
// FIXME(linux): Parts of netfilter/nfnetlink*.h require more recent kernel headers:
4392-
| "RTNLGRP_MCTP_IFADDR" // linux v5.17+
4393-
| "RTNLGRP_TUNNEL" // linux v5.18+
4394-
| "RTNLGRP_STATS" // linux v5.18+
4395-
=> true,
4352+
// Not present on old musl
4353+
"PR_SET_VMA"
4354+
| "PR_SET_VMA_ANON_NAME"
4355+
| "PR_SCHED_CORE"
4356+
| "PR_SCHED_CORE_CREATE"
4357+
| "PR_SCHED_CORE_GET"
4358+
| "PR_SCHED_CORE_MAX"
4359+
| "PR_SCHED_CORE_SCOPE_PROCESS_GROUP"
4360+
| "PR_SCHED_CORE_SCOPE_THREAD"
4361+
| "PR_SCHED_CORE_SCOPE_THREAD_GROUP"
4362+
| "PR_SCHED_CORE_SHARE_FROM"
4363+
| "PR_SCHED_CORE_SHARE_TO" if old_musl => true,
4364+
4365+
// Not present in glibc
4366+
"PR_SME_VL_LEN_MAX" | "PR_SME_SET_VL_INHERIT" | "PR_SME_SET_VL_ONE_EXEC" if gnu => true,
43964367

43974368
// FIXME(linux): The below is no longer const in glibc 2.34:
43984369
// https://github.com/bminor/glibc/commit/5d98a7dae955bafa6740c26eaba9c86060ae0344
@@ -4401,15 +4372,9 @@ fn test_linux(target: &str) {
44014372
| "MINSIGSTKSZ"
44024373
if gnu => true,
44034374

4404-
// FIXME(linux): Linux >= 5.16:
4405-
// https://github.com/torvalds/linux/commit/42df6e1d221dddc0f2acf2be37e68d553ad65f96
4406-
"NF_NETDEV_EGRESS" if sparc64 => true,
44074375
// value changed
44084376
"NF_NETDEV_NUMHOOKS" if sparc64 => true,
44094377

4410-
// FIXME(linux): requires Linux >= v5.8
4411-
"IF_LINK_MODE_TESTING" if sparc64 => true,
4412-
44134378
// FIXME(linux): Requires >= 6.3 kernel headers
44144379
"MFD_EXEC" | "MFD_NOEXEC_SEAL" if sparc64 => true,
44154380

@@ -4809,7 +4774,9 @@ fn test_linux(target: &str) {
48094774
// After musl 1.2.0, the type becomes `int` instead of `long`.
48104775
(old_musl && struct_ == "utmpx" && field == "ut_session") ||
48114776
// `frames` is a flexible array member
4812-
(struct_ == "bcm_msg_head" && field == "frames")
4777+
(struct_ == "bcm_msg_head" && field == "frames") ||
4778+
// FAM
4779+
(struct_ == "af_alg_iv" && field == "iv")
48134780
});
48144781

48154782
cfg.skip_roundtrip(move |s| match s {

0 commit comments

Comments
 (0)