Skip to content

Commit 7238ba5

Browse files
committed
test: linux: musl: Unskip types that needed newer kernel headers
Our musl tests now use more recent headers, so we can start testing a number of types again.
1 parent 969d956 commit 7238ba5

File tree

1 file changed

+0
-70
lines changed

1 file changed

+0
-70
lines changed

libc-test/build.rs

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3997,41 +3997,13 @@ 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 >= 5.1 kernel headers.
4001-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4002-
"tls12_crypto_info_aes_gcm_256"
4003-
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
4004-
{
4005-
true
4006-
}
4007-
4008-
// FIXME(linux): Requires >= 5.11 kernel headers.
4009-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4010-
"tls12_crypto_info_chacha20_poly1305"
4011-
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
4012-
{
4013-
true
4014-
}
4015-
4016-
// FIXME(linux): Requires >= 5.3 kernel headers.
4017-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4018-
"xdp_options" if musl => true,
4019-
4020-
// FIXME(linux): Requires >= 5.4 kernel headers.
4021-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4022-
"xdp_ring_offset" | "xdp_mmap_offsets" if musl => true,
4023-
40244000
// FIXME(linux): Requires >= 6.8 kernel headers.
40254001
// A field was added in 6.8.
40264002
// https://github.com/torvalds/linux/commit/341ac980eab90ac1f6c22ee9f9da83ed9604d899
40274003
// The previous version of the struct was removed in 6.11 due to a bug.
40284004
// https://github.com/torvalds/linux/commit/32654bbd6313b4cfc82297e6634fa9725c3c900f
40294005
"xdp_umem_reg" => true,
40304006

4031-
// FIXME(linux): Requires >= 5.9 kernel headers.
4032-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4033-
"xdp_statistics" if musl => true,
4034-
40354007
// FIXME(linux): Requires >= 6.8 kernel headers.
40364008
"xsk_tx_metadata"
40374009
| "__c_anonymous_xsk_tx_metadata_union"
@@ -4115,48 +4087,6 @@ fn test_linux(target: &str) {
41154087
}
41164088
}
41174089
if musl {
4118-
// FIXME(linux): Requires >= 5.0 kernel headers
4119-
if name == "SECCOMP_GET_NOTIF_SIZES"
4120-
|| name == "SECCOMP_FILTER_FLAG_NEW_LISTENER"
4121-
|| name == "SECCOMP_FILTER_FLAG_TSYNC_ESRCH"
4122-
|| name == "SECCOMP_USER_NOTIF_FLAG_CONTINUE" // requires >= 5.5
4123-
|| name == "SECCOMP_ADDFD_FLAG_SETFD" // requires >= 5.9
4124-
|| name == "SECCOMP_ADDFD_FLAG_SEND" // requires >= 5.9
4125-
|| name == "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" // requires >= 5.19
4126-
{
4127-
return true;
4128-
}
4129-
// FIXME(linux): Requires >= 4.20 kernel headers
4130-
if name == "PTP_SYS_OFFSET_EXTENDED" {
4131-
return true;
4132-
}
4133-
// FIXME(linux): Requires >= 5.4 kernel headers
4134-
if name == "PTP_CLOCK_GETCAPS2"
4135-
|| name == "PTP_ENABLE_PPS2"
4136-
|| name == "PTP_EXTTS_REQUEST2"
4137-
|| name == "PTP_PEROUT_REQUEST2"
4138-
|| name == "PTP_PIN_GETFUNC2"
4139-
|| name == "PTP_PIN_SETFUNC2"
4140-
|| name == "PTP_SYS_OFFSET2"
4141-
|| name == "PTP_SYS_OFFSET_PRECISE2"
4142-
|| name == "PTP_SYS_OFFSET_EXTENDED2"
4143-
{
4144-
return true;
4145-
}
4146-
// FIXME(linux): Requires >= 5.4.1 kernel headers
4147-
if name.starts_with("J1939")
4148-
|| name.starts_with("RTEXT_FILTER_")
4149-
|| name.starts_with("SO_J1939")
4150-
|| name.starts_with("SCM_J1939")
4151-
{
4152-
return true;
4153-
}
4154-
// FIXME(linux): Requires >= 5.10 kernel headers
4155-
if name.starts_with("MEMBARRIER_CMD_REGISTER")
4156-
|| name.starts_with("MEMBARRIER_CMD_PRIVATE")
4157-
{
4158-
return true;
4159-
}
41604090
// LFS64 types have been removed in musl 1.2.4+
41614091
if name.starts_with("RLIM64") {
41624092
return true;

0 commit comments

Comments
 (0)