Skip to content

Commit 268a77f

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 2f7b5f0 commit 268a77f

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

4176-
// FIXME(linux): Requires >= 5.9 kernel headers.
4177-
// Everything that uses install-musl.sh has 4.19 kernel headers.
4178-
"xdp_statistics" if musl => true,
4179-
41804152
// FIXME(linux): Requires >= 6.8 kernel headers.
41814153
"xsk_tx_metadata"
41824154
| "__c_anonymous_xsk_tx_metadata_union"
@@ -4260,48 +4232,6 @@ fn test_linux(target: &str) {
42604232
}
42614233
}
42624234
if musl {
4263-
// FIXME(linux): Requires >= 5.0 kernel headers
4264-
if name == "SECCOMP_GET_NOTIF_SIZES"
4265-
|| name == "SECCOMP_FILTER_FLAG_NEW_LISTENER"
4266-
|| name == "SECCOMP_FILTER_FLAG_TSYNC_ESRCH"
4267-
|| name == "SECCOMP_USER_NOTIF_FLAG_CONTINUE" // requires >= 5.5
4268-
|| name == "SECCOMP_ADDFD_FLAG_SETFD" // requires >= 5.9
4269-
|| name == "SECCOMP_ADDFD_FLAG_SEND" // requires >= 5.9
4270-
|| name == "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" // requires >= 5.19
4271-
{
4272-
return true;
4273-
}
4274-
// FIXME(linux): Requires >= 4.20 kernel headers
4275-
if name == "PTP_SYS_OFFSET_EXTENDED" {
4276-
return true;
4277-
}
4278-
// FIXME(linux): Requires >= 5.4 kernel headers
4279-
if name == "PTP_CLOCK_GETCAPS2"
4280-
|| name == "PTP_ENABLE_PPS2"
4281-
|| name == "PTP_EXTTS_REQUEST2"
4282-
|| name == "PTP_PEROUT_REQUEST2"
4283-
|| name == "PTP_PIN_GETFUNC2"
4284-
|| name == "PTP_PIN_SETFUNC2"
4285-
|| name == "PTP_SYS_OFFSET2"
4286-
|| name == "PTP_SYS_OFFSET_PRECISE2"
4287-
|| name == "PTP_SYS_OFFSET_EXTENDED2"
4288-
{
4289-
return true;
4290-
}
4291-
// FIXME(linux): Requires >= 5.4.1 kernel headers
4292-
if name.starts_with("J1939")
4293-
|| name.starts_with("RTEXT_FILTER_")
4294-
|| name.starts_with("SO_J1939")
4295-
|| name.starts_with("SCM_J1939")
4296-
{
4297-
return true;
4298-
}
4299-
// FIXME(linux): Requires >= 5.10 kernel headers
4300-
if name.starts_with("MEMBARRIER_CMD_REGISTER")
4301-
|| name.starts_with("MEMBARRIER_CMD_PRIVATE")
4302-
{
4303-
return true;
4304-
}
43054235
// LFS64 types have been removed in musl 1.2.4+
43064236
if name.starts_with("RLIM64") {
43074237
return true;

0 commit comments

Comments
 (0)