Skip to content

Commit 526fe4d

Browse files
tammelatammela
committed
ci: cleanup linux skips
Also shifts some constants to the musl guard check Signed-off-by: Pedro Tammela <[email protected]>
1 parent 094464b commit 526fe4d

File tree

1 file changed

+31
-108
lines changed

1 file changed

+31
-108
lines changed

‎libc-test/build.rs

Lines changed: 31 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -3919,11 +3919,6 @@ fn test_linux(target: &str) {
39193919
return true;
39203920
}
39213921

3922-
// FIXME(linux): sparc64 CI has old headers
3923-
if sparc64 && (ty == "uinput_ff_erase" || ty == "uinput_abs_setup") {
3924-
return true;
3925-
}
3926-
39273922
// FIXME(#1558): passing by value corrupts the value for reasons not understood.
39283923
if (gnu && sparc64) && (ty == "ip_mreqn" || ty == "hwtstamp_config") {
39293924
return true;
@@ -3994,48 +3989,17 @@ fn test_linux(target: &str) {
39943989
"sctp_initmsg" | "sctp_sndrcvinfo" | "sctp_sndinfo" | "sctp_rcvinfo"
39953990
| "sctp_nxtinfo" | "sctp_prinfo" | "sctp_authinfo" => true,
39963991

3997-
// FIXME(linux): requires >= 6.1 kernel headers
3998-
"canxl_frame" => true,
3999-
40003992
// FIXME(linux): The size of `iv` has been changed since Linux v6.0
40013993
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
40023994
"af_alg_iv" => true,
40033995

4004-
// FIXME(linux): Requires >= 5.1 kernel headers.
4005-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4006-
"tls12_crypto_info_aes_gcm_256"
4007-
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
4008-
{
4009-
true
4010-
}
4011-
4012-
// FIXME(linux): Requires >= 5.11 kernel headers.
4013-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4014-
"tls12_crypto_info_chacha20_poly1305"
4015-
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
4016-
{
4017-
true
4018-
}
4019-
4020-
// FIXME(linux): Requires >= 5.3 kernel headers.
4021-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4022-
"xdp_options" if musl => true,
4023-
4024-
// FIXME(linux): Requires >= 5.4 kernel headers.
4025-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4026-
"xdp_ring_offset" | "xdp_mmap_offsets" if musl => true,
4027-
40283996
// FIXME(linux): Requires >= 6.8 kernel headers.
40293997
// A field was added in 6.8.
40303998
// https://github.com/torvalds/linux/commit/341ac980eab90ac1f6c22ee9f9da83ed9604d899
40313999
// The previous version of the struct was removed in 6.11 due to a bug.
40324000
// https://github.com/torvalds/linux/commit/32654bbd6313b4cfc82297e6634fa9725c3c900f
40334001
"xdp_umem_reg" => true,
40344002

4035-
// FIXME(linux): Requires >= 5.9 kernel headers.
4036-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4037-
"xdp_statistics" if musl => true,
4038-
40394003
// FIXME(linux): Requires >= 6.8 kernel headers.
40404004
"xsk_tx_metadata"
40414005
| "__c_anonymous_xsk_tx_metadata_union"
@@ -4189,6 +4153,36 @@ fn test_linux(target: &str) {
41894153
{
41904154
return true;
41914155
}
4156+
// FIXME(musl): Not in musl yet
4157+
if name == "PR_SET_VMA"
4158+
|| name == "PR_SET_VMA_ANON_NAME"
4159+
|| name == "PR_SCHED_CORE"
4160+
|| name == "PR_SCHED_CORE_GET"
4161+
|| name == "PR_SCHED_CORE_CREATE"
4162+
|| name == "PR_SCHED_CORE_SHARE_TO"
4163+
|| name == "PR_SCHED_CORE_SHARE_FROM"
4164+
|| name == "PR_SCHED_CORE_MAX"
4165+
|| name == "PR_SCHED_CORE_SCOPE_THREAD"
4166+
|| name == "PR_SCHED_CORE_SCOPE_THREAD_GROUP"
4167+
|| name == "PR_SCHED_CORE_SCOPE_PROCESS_GROUP"
4168+
{
4169+
return true;
4170+
}
4171+
// FIXME(musl): Not in musl yet
4172+
if name == "FAN_FS_ERROR"
4173+
|| name == "FAN_RENAME"
4174+
|| name == "FAN_REPORT_TARGET_FID"
4175+
|| name == "FAN_REPORT_DFID_NAME_TARGET"
4176+
|| name == "FAN_MARK_EVICTABLE"
4177+
|| name == "FAN_EVENT_INFO_TYPE_ERROR"
4178+
|| name == "FAN_EVENT_INFO_TYPE_OLD_DFID_NAME"
4179+
|| name == "FAN_EVENT_INFO_TYPE_NEW_DFID_NAME"
4180+
|| name == "FAN_RESPONSE_INFO_NONE"
4181+
|| name == "FAN_RESPONSE_INFO_AUDIT_RULE"
4182+
|| name == "FAN_INFO"
4183+
{
4184+
return true;
4185+
}
41924186
}
41934187
match name {
41944188
// These constants are not available if gnu headers have been included
@@ -4253,30 +4247,6 @@ fn test_linux(target: &str) {
42534247
// FIXME(linux): Not defined on ARM, gnueabihf, musl, PowerPC, riscv64, s390x, and sparc64.
42544248
"SYS_memfd_secret" if arm | gnueabihf | musl | ppc | riscv64 | s390x | sparc64 => true,
42554249

4256-
// FIXME(linux): Added in Linux 5.16
4257-
// https://github.com/torvalds/linux/commit/039c0ec9bb77446d7ada7f55f90af9299b28ca49
4258-
"SYS_futex_waitv" => true,
4259-
4260-
// FIXME(linux): Added in Linux 5.17
4261-
// https://github.com/torvalds/linux/commit/c6018b4b254971863bd0ad36bb5e7d0fa0f0ddb0
4262-
"SYS_set_mempolicy_home_node" => true,
4263-
4264-
// FIXME(linux): Added in Linux 5.18
4265-
// https://github.com/torvalds/linux/commit/8b5413647262dda8d8d0e07e14ea1de9ac7cf0b2
4266-
"NFQA_PRIORITY" => true,
4267-
4268-
// FIXME(linux): requires more recent kernel headers on CI
4269-
| "UINPUT_VERSION"
4270-
| "SW_MAX"
4271-
| "SW_CNT"
4272-
if ppc64 || riscv64 => true,
4273-
4274-
// FIXME(linux): requires more recent kernel headers on CI
4275-
"SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" if sparc64 => true,
4276-
4277-
// FIXME(linux): Not currently available in headers on ARM and musl.
4278-
"NETLINK_GET_STRICT_CHK" if arm => true,
4279-
42804250
// Skip as this signal codes and trap reasons need newer headers
42814251
"SI_DETHREAD" | "TRAP_PERF" => true,
42824252

@@ -4302,20 +4272,6 @@ fn test_linux(target: &str) {
43024272
// is a private value for kernel usage normally
43034273
"FUSE_SUPER_MAGIC" => true,
43044274

4305-
// linux 5.17 min
4306-
"PR_SET_VMA" | "PR_SET_VMA_ANON_NAME" => true,
4307-
4308-
// present in recent kernels only
4309-
"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,
4310-
4311-
// present in recent kernels only >= 5.13
4312-
"PR_PAC_SET_ENABLED_KEYS" | "PR_PAC_GET_ENABLED_KEYS" => true,
4313-
// present in recent kernels only >= 5.19
4314-
"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,
4315-
4316-
// Added in Linux 5.14
4317-
"FUTEX_LOCK_PI2" => true,
4318-
43194275
// Added in linux 6.1
43204276
"STATX_DIOALIGN"
43214277
| "CAN_RAW_XL_FRAMES"
@@ -4334,28 +4290,13 @@ fn test_linux(target: &str) {
43344290
| "CANXL_XLF"
43354291
=> true,
43364292

4337-
// FIXME(linux): Parts of netfilter/nfnetlink*.h require more recent kernel headers:
4338-
| "RTNLGRP_MCTP_IFADDR" // linux v5.17+
4339-
| "RTNLGRP_TUNNEL" // linux v5.18+
4340-
| "RTNLGRP_STATS" // linux v5.18+
4341-
=> true,
4342-
43434293
// FIXME(linux): The below is no longer const in glibc 2.34:
43444294
// https://github.com/bminor/glibc/commit/5d98a7dae955bafa6740c26eaba9c86060ae0344
43454295
| "PTHREAD_STACK_MIN"
43464296
| "SIGSTKSZ"
43474297
| "MINSIGSTKSZ"
43484298
if gnu => true,
43494299

4350-
// FIXME(linux): Linux >= 5.16:
4351-
// https://github.com/torvalds/linux/commit/42df6e1d221dddc0f2acf2be37e68d553ad65f96
4352-
"NF_NETDEV_EGRESS" if sparc64 => true,
4353-
// value changed
4354-
"NF_NETDEV_NUMHOOKS" if sparc64 => true,
4355-
4356-
// FIXME(linux): requires Linux >= v5.8
4357-
"IF_LINK_MODE_TESTING" if sparc64 => true,
4358-
43594300
// FIXME(linux): Requires >= 6.3 kernel headers
43604301
"MFD_EXEC" | "MFD_NOEXEC_SEAL" if sparc64 => true,
43614302

@@ -4366,35 +4307,17 @@ fn test_linux(target: &str) {
43664307
"TUN_F_USO4" | "TUN_F_USO6" | "IFF_NO_CARRIER" => true,
43674308

43684309
// FIXME(linux): Requires more recent kernel headers
4369-
| "IFLA_PARENT_DEV_NAME" // linux v5.13+
4370-
| "IFLA_PARENT_DEV_BUS_NAME" // linux v5.13+
4371-
| "IFLA_GRO_MAX_SIZE" // linux v5.16+
4372-
| "IFLA_TSO_MAX_SIZE" // linux v5.18+
4373-
| "IFLA_TSO_MAX_SEGS" // linux v5.18+
4374-
| "IFLA_ALLMULTI" // linux v6.0+
4375-
| "MADV_DONTNEED_LOCKED" // linux v5.18+
4310+
"IFLA_ALLMULTI" // linux v6.0+
43764311
=> true,
4377-
"SCTP_FUTURE_ASSOC" | "SCTP_CURRENT_ASSOC" | "SCTP_ALL_ASSOC" | "SCTP_PEER_ADDR_THLDS_V2" => true, // linux 5.5+
43784312

43794313
// kernel 6.5 minimum
43804314
"MOVE_MOUNT_BENEATH" => true,
43814315
// FIXME(linux): Requires linux 6.1
43824316
"ALG_SET_KEY_BY_KEY_SERIAL" | "ALG_SET_DRBG_ENTROPY" => true,
43834317

43844318
// FIXME(linux): Requires more recent kernel headers
4385-
| "FAN_FS_ERROR" // linux v5.16+
4386-
| "FAN_RENAME" // linux v5.17+
4387-
| "FAN_REPORT_TARGET_FID" // linux v5.17+
4388-
| "FAN_REPORT_DFID_NAME_TARGET" // linux v5.17+
4389-
| "FAN_MARK_EVICTABLE" // linux v5.19+
43904319
| "FAN_MARK_IGNORE" // linux v6.0+
43914320
| "FAN_MARK_IGNORE_SURV" // linux v6.0+
4392-
| "FAN_EVENT_INFO_TYPE_ERROR" // linux v5.16+
4393-
| "FAN_EVENT_INFO_TYPE_OLD_DFID_NAME" // linux v5.17+
4394-
| "FAN_EVENT_INFO_TYPE_NEW_DFID_NAME" // linux v5.17+
4395-
| "FAN_RESPONSE_INFO_NONE" // linux v5.16+
4396-
| "FAN_RESPONSE_INFO_AUDIT_RULE" // linux v5.16+
4397-
| "FAN_INFO" // linux v5.16+
43984321
=> true,
43994322

44004323
// musl doesn't use <linux/fanotify.h> in <sys/fanotify.h>

0 commit comments

Comments
 (0)