Skip to content

Commit 7cbb09e

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. (backport <#4760>) (cherry picked from commit 7238ba5)
1 parent 5a9f482 commit 7cbb09e

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
@@ -4146,41 +4146,13 @@ 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 >= 5.1 kernel headers.
4150-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4151-
"tls12_crypto_info_aes_gcm_256"
4152-
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
4153-
{
4154-
true
4155-
}
4156-
4157-
// FIXME(linux): Requires >= 5.11 kernel headers.
4158-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4159-
"tls12_crypto_info_chacha20_poly1305"
4160-
if (aarch64 || arm || i686 || s390x || x86_64) && musl =>
4161-
{
4162-
true
4163-
}
4164-
4165-
// FIXME(linux): Requires >= 5.3 kernel headers.
4166-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4167-
"xdp_options" if musl => true,
4168-
4169-
// FIXME(linux): Requires >= 5.4 kernel headers.
4170-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4171-
"xdp_ring_offset" | "xdp_mmap_offsets" if musl => true,
4172-
41734149
// FIXME(linux): Requires >= 6.8 kernel headers.
41744150
// A field was added in 6.8.
41754151
// https://github.com/torvalds/linux/commit/341ac980eab90ac1f6c22ee9f9da83ed9604d899
41764152
// The previous version of the struct was removed in 6.11 due to a bug.
41774153
// https://github.com/torvalds/linux/commit/32654bbd6313b4cfc82297e6634fa9725c3c900f
41784154
"xdp_umem_reg" => true,
41794155

4180-
// FIXME(linux): Requires >= 5.9 kernel headers.
4181-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4182-
"xdp_statistics" if musl => true,
4183-
41844156
// FIXME(linux): Requires >= 6.8 kernel headers.
41854157
"xsk_tx_metadata"
41864158
| "__c_anonymous_xsk_tx_metadata_union"
@@ -4264,48 +4236,6 @@ fn test_linux(target: &str) {
42644236
}
42654237
}
42664238
if musl {
4267-
// FIXME(linux): Requires >= 5.0 kernel headers
4268-
if name == "SECCOMP_GET_NOTIF_SIZES"
4269-
|| name == "SECCOMP_FILTER_FLAG_NEW_LISTENER"
4270-
|| name == "SECCOMP_FILTER_FLAG_TSYNC_ESRCH"
4271-
|| name == "SECCOMP_USER_NOTIF_FLAG_CONTINUE" // requires >= 5.5
4272-
|| name == "SECCOMP_ADDFD_FLAG_SETFD" // requires >= 5.9
4273-
|| name == "SECCOMP_ADDFD_FLAG_SEND" // requires >= 5.9
4274-
|| name == "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" // requires >= 5.19
4275-
{
4276-
return true;
4277-
}
4278-
// FIXME(linux): Requires >= 4.20 kernel headers
4279-
if name == "PTP_SYS_OFFSET_EXTENDED" {
4280-
return true;
4281-
}
4282-
// FIXME(linux): Requires >= 5.4 kernel headers
4283-
if name == "PTP_CLOCK_GETCAPS2"
4284-
|| name == "PTP_ENABLE_PPS2"
4285-
|| name == "PTP_EXTTS_REQUEST2"
4286-
|| name == "PTP_PEROUT_REQUEST2"
4287-
|| name == "PTP_PIN_GETFUNC2"
4288-
|| name == "PTP_PIN_SETFUNC2"
4289-
|| name == "PTP_SYS_OFFSET2"
4290-
|| name == "PTP_SYS_OFFSET_PRECISE2"
4291-
|| name == "PTP_SYS_OFFSET_EXTENDED2"
4292-
{
4293-
return true;
4294-
}
4295-
// FIXME(linux): Requires >= 5.4.1 kernel headers
4296-
if name.starts_with("J1939")
4297-
|| name.starts_with("RTEXT_FILTER_")
4298-
|| name.starts_with("SO_J1939")
4299-
|| name.starts_with("SCM_J1939")
4300-
{
4301-
return true;
4302-
}
4303-
// FIXME(linux): Requires >= 5.10 kernel headers
4304-
if name.starts_with("MEMBARRIER_CMD_REGISTER")
4305-
|| name.starts_with("MEMBARRIER_CMD_PRIVATE")
4306-
{
4307-
return true;
4308-
}
43094239
// LFS64 types have been removed in musl 1.2.4+
43104240
if name.starts_with("RLIM64") {
43114241
return true;

0 commit comments

Comments
 (0)