Skip to content

Commit 5a9f482

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 560f359 commit 5a9f482

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

4149-
// FIXME(linux): requires >= 6.1 kernel headers
4150-
"canxl_frame" => true,
4151-
4152-
// FIXME(linux): The size of `iv` has been changed since Linux v6.0
4153-
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
4154-
"af_alg_iv" => true,
4155-
41564149
// FIXME(linux): Requires >= 5.1 kernel headers.
41574150
// Everything that uses install-musl.sh has 4.19 kernel headers.
41584151
"tls12_crypto_info_aes_gcm_256"
@@ -4505,43 +4498,21 @@ fn test_linux(target: &str) {
45054498
// is a private value for kernel usage normally
45064499
"FUSE_SUPER_MAGIC" => true,
45074500

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

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

4553-
// FIXME(linux): Linux >= 5.16:
4554-
// https://github.com/torvalds/linux/commit/42df6e1d221dddc0f2acf2be37e68d553ad65f96
4555-
"NF_NETDEV_EGRESS" if sparc64 => true,
45564524
// value changed
45574525
"NF_NETDEV_NUMHOOKS" if sparc64 => true,
45584526

4559-
// FIXME(linux): requires Linux >= v5.8
4560-
"IF_LINK_MODE_TESTING" if sparc64 => true,
4561-
45624527
// DIFF(main): fixed in 1.0 with e9abac9ac2
45634528
"CLONE_CLEAR_SIGHAND" | "CLONE_INTO_CGROUP" => true,
45644529

@@ -4965,7 +4930,9 @@ fn test_linux(target: &str) {
49654930
// After musl 1.2.0, the type becomes `int` instead of `long`.
49664931
(old_musl && struct_ == "utmpx" && field == "ut_session") ||
49674932
// `frames` is a flexible array member
4968-
(struct_ == "bcm_msg_head" && field == "frames")
4933+
(struct_ == "bcm_msg_head" && field == "frames") ||
4934+
// FAM
4935+
(struct_ == "af_alg_iv" && field == "iv")
49694936
});
49704937

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

0 commit comments

Comments
 (0)