Skip to content

Commit 2f7b5f0

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. (backport <#4760>) (cherry picked from commit 969d956)
1 parent 8a020ce commit 2f7b5f0

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
@@ -4142,13 +4142,6 @@ fn test_linux(target: &str) {
41424142
"sctp_initmsg" | "sctp_sndrcvinfo" | "sctp_sndinfo" | "sctp_rcvinfo"
41434143
| "sctp_nxtinfo" | "sctp_prinfo" | "sctp_authinfo" => true,
41444144

4145-
// FIXME(linux): requires >= 6.1 kernel headers
4146-
"canxl_frame" => true,
4147-
4148-
// FIXME(linux): The size of `iv` has been changed since Linux v6.0
4149-
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
4150-
"af_alg_iv" => true,
4151-
41524145
// FIXME(linux): Requires >= 5.1 kernel headers.
41534146
// Everything that uses install-musl.sh has 4.19 kernel headers.
41544147
"tls12_crypto_info_aes_gcm_256"
@@ -4501,43 +4494,21 @@ fn test_linux(target: &str) {
45014494
// is a private value for kernel usage normally
45024495
"FUSE_SUPER_MAGIC" => true,
45034496

4504-
// linux 5.17 min
4505-
"PR_SET_VMA" | "PR_SET_VMA_ANON_NAME" => true,
4506-
4507-
// present in recent kernels only
4508-
"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,
4509-
4510-
// present in recent kernels only >= 5.13
4511-
"PR_PAC_SET_ENABLED_KEYS" | "PR_PAC_GET_ENABLED_KEYS" => true,
4512-
// present in recent kernels only >= 5.19
4513-
"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,
4514-
4515-
// Added in Linux 5.14
4516-
"FUTEX_LOCK_PI2" => true,
4517-
4518-
// Added in linux 6.1
4519-
"STATX_DIOALIGN"
4520-
| "CAN_RAW_XL_FRAMES"
4521-
| "CANXL_HDR_SIZE"
4522-
| "CANXL_MAX_DLC"
4523-
| "CANXL_MAX_DLC_MASK"
4524-
| "CANXL_MAX_DLEN"
4525-
| "CANXL_MAX_MTU"
4526-
| "CANXL_MIN_DLC"
4527-
| "CANXL_MIN_DLEN"
4528-
| "CANXL_MIN_MTU"
4529-
| "CANXL_MTU"
4530-
| "CANXL_PRIO_BITS"
4531-
| "CANXL_PRIO_MASK"
4532-
| "CANXL_SEC"
4533-
| "CANXL_XLF"
4534-
=> true,
4535-
4536-
// FIXME(linux): Parts of netfilter/nfnetlink*.h require more recent kernel headers:
4537-
| "RTNLGRP_MCTP_IFADDR" // linux v5.17+
4538-
| "RTNLGRP_TUNNEL" // linux v5.18+
4539-
| "RTNLGRP_STATS" // linux v5.18+
4540-
=> true,
4497+
// Not present on old musl
4498+
"PR_SET_VMA"
4499+
| "PR_SET_VMA_ANON_NAME"
4500+
| "PR_SCHED_CORE"
4501+
| "PR_SCHED_CORE_CREATE"
4502+
| "PR_SCHED_CORE_GET"
4503+
| "PR_SCHED_CORE_MAX"
4504+
| "PR_SCHED_CORE_SCOPE_PROCESS_GROUP"
4505+
| "PR_SCHED_CORE_SCOPE_THREAD"
4506+
| "PR_SCHED_CORE_SCOPE_THREAD_GROUP"
4507+
| "PR_SCHED_CORE_SHARE_FROM"
4508+
| "PR_SCHED_CORE_SHARE_TO" if old_musl => true,
4509+
4510+
// Not present in glibc
4511+
"PR_SME_VL_LEN_MAX" | "PR_SME_SET_VL_INHERIT" | "PR_SME_SET_VL_ONE_EXEC" if gnu => true,
45414512

45424513
// FIXME(linux): The below is no longer const in glibc 2.34:
45434514
// https://github.com/bminor/glibc/commit/5d98a7dae955bafa6740c26eaba9c86060ae0344
@@ -4546,15 +4517,9 @@ fn test_linux(target: &str) {
45464517
| "MINSIGSTKSZ"
45474518
if gnu => true,
45484519

4549-
// FIXME(linux): Linux >= 5.16:
4550-
// https://github.com/torvalds/linux/commit/42df6e1d221dddc0f2acf2be37e68d553ad65f96
4551-
"NF_NETDEV_EGRESS" if sparc64 => true,
45524520
// value changed
45534521
"NF_NETDEV_NUMHOOKS" if sparc64 => true,
45544522

4555-
// FIXME(linux): requires Linux >= v5.8
4556-
"IF_LINK_MODE_TESTING" if sparc64 => true,
4557-
45584523
// DIFF(main): fixed in 1.0 with e9abac9ac2
45594524
"CLONE_CLEAR_SIGHAND" | "CLONE_INTO_CGROUP" => true,
45604525

@@ -4961,7 +4926,9 @@ fn test_linux(target: &str) {
49614926
// After musl 1.2.0, the type becomes `int` instead of `long`.
49624927
(old_musl && struct_ == "utmpx" && field == "ut_session") ||
49634928
// `frames` is a flexible array member
4964-
(struct_ == "bcm_msg_head" && field == "frames")
4929+
(struct_ == "bcm_msg_head" && field == "frames") ||
4930+
// FAM
4931+
(struct_ == "af_alg_iv" && field == "iv")
49654932
});
49664933

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

0 commit comments

Comments
 (0)