Skip to content

musl: Fix CI for testing with version 1.2.3+ #4775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2025
Merged

musl: Fix CI for testing with version 1.2.3+ #4775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49e60a7
ci: Pass the `MUSL_V1_2_3` env in docker
tgross35 Oct 26, 2025
f230904
musl: Fix skips with recent versions
tgross35 Oct 26, 2025
6d7d1d8
ci: Skip running ctest on ppc64le-musl
tgross35 Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/run-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ run() {
--env LIBC_CI_ZBUILD_STD \
--env RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS \
--env RUST_LIBC_UNSTABLE_GNU_TIME_BITS \
--env RUST_LIBC_UNSTABLE_MUSL_V1_2_3 \
--env CARGO_HOME=/cargo \
--env CARGO_TARGET_DIR=/checkout/target \
--volume "$CARGO_HOME":/cargo \
Expand Down
3 changes: 2 additions & 1 deletion ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ esac
case "$target" in
# crash in std::env::tmp_dir (no filesystem on wasm).
*wasm*) cmd="$cmd --exclude ctest --exclude ctest-test --exclude ctest-next" ;;
# Loongarch was fixed, but there are new instances of
# https://github.com/bytecodealliance/rustix/issues/1496
*loongarch*) cmd="$cmd --exclude ctest --exclude ctest-test --exclude ctest-next" ;;
powerpc64le*musl) cmd="$cmd --exclude ctest --exclude ctest-test --exclude ctest-next" ;;
esac

# shellcheck disable=SC2086
Expand Down
125 changes: 61 additions & 64 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3935,8 +3935,14 @@ fn test_linux(target: &str) {
// FIXME(linux): Requires >= 6.12 kernel headers.
"mnt_ns_info" => true,

// Struct has changed for new musl versions
"tcp_info" if old_musl => true,
// FIXME(musl): Struct has changed for new musl versions
"tcp_info" if musl => true,

// FIXME(musl): Supported in new musl but we don't have a new enough version in CI.
"statx" | "statx_timestamp" if musl => true,

// FIXME(musl): New fields in newer versions
"utmpx" if !old_musl => true,

_ => false,
}
Expand Down Expand Up @@ -3990,35 +3996,26 @@ fn test_linux(target: &str) {
if name.starts_with("NI_IDN") {
return true;
}
// FIXME(musl): Not in musl yet
if name == "SO_NETNS_COOKIE"
|| name == "SO_BUF_LOCK"
|| name == "SO_RESERVE_MEM"
|| name == "SO_TXREHASH"
|| name == "SO_RCVMARK"
|| name == "SO_PASSPIDFD"
|| name == "SO_PEERPIDFD"
|| name == "SO_DEVMEM_LINEAR"
|| name == "SO_DEVMEM_DMABUF"
|| name == "SO_DEVMEM_DONTNEED"
{
return true;
}
// FIXME(musl): Not in musl yet
if name == "SCM_DEVMEM_LINEAR" || name == "SCM_DEVMEM_DMABUF" {
return true;
}
// FIXME: Does not exist on non-x86 architectures, slated for removal
// in libc in 1.0
if ppc64 && name == "MAP_32BIT" {
return true;
}
}
if old_musl {
// Constants that don't exist on the old version of musl we test with, but do exist
// on newer versions.

match name {
"FAN_EVENT_INFO_TYPE_ERROR"
// FIXME: Does not exist on non-x86 architectures, slated for removal
// in libc in 1.0
"MAP_32BIT" if ppc64 => return true,

// FIXME(musl): None of these are actually defined in musl, they should be removed.
"SO_NETNS_COOKIE"
| "SO_BUF_LOCK"
| "SO_RESERVE_MEM"
| "SO_TXREHASH"
| "SO_RCVMARK"
| "SO_PASSPIDFD"
| "SO_PEERPIDFD"
| "SO_DEVMEM_LINEAR"
| "SO_DEVMEM_DMABUF"
| "SO_DEVMEM_DONTNEED"
| "SCM_DEVMEM_LINEAR"
| "SCM_DEVMEM_DMABUF"
| "FAN_EVENT_INFO_TYPE_ERROR"
| "FAN_EVENT_INFO_TYPE_NEW_DFID_NAME"
| "FAN_EVENT_INFO_TYPE_OLD_DFID_NAME"
| "FAN_FS_ERROR"
Expand All @@ -4031,21 +4028,39 @@ fn test_linux(target: &str) {
| "FAN_REPORT_TARGET_FID"
| "FAN_RESPONSE_INFO_AUDIT_RULE"
| "FAN_RESPONSE_INFO_NONE"
| "IPPROTO_ETHERNET"
| "IPPROTO_MPTCP"
| "PR_GET_MDWE"
| "PR_MDWE_NO_INHERIT"
| "PR_MDWE_REFUSE_EXEC_GAIN"
| "PR_SET_MDWE"
| "RLIM_NLIMITS"
| "IPPROTO_ETHERNET"
| "IPPROTO_MPTCP"
| "SI_DETHREAD"
| "SO_BUSY_POLL_BUDGET"
| "SO_PREFER_BUSY_POLL" => return true,
// Values changed in newer musl versions on these arches
| "PR_SET_VMA"
| "PR_SET_VMA_ANON_NAME"
| "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" => return true,

/* Added in versions more recent than what we test */
// Since 1.2.3
"SO_BUSY_POLL_BUDGET" | "SO_PREFER_BUSY_POLL" => return true,

// FIXME(musl): value was updated in new musl
"RLIM_NLIMITS" => return true,

// FIXME(musl): Values changed in newer musl versions on these arches
"O_LARGEFILE" if riscv64 || x86_64 => return true,

_ => (),
}
}

match name {
// These constants are not available if gnu headers have been included
// and can therefore not be tested here
Expand Down Expand Up @@ -4158,23 +4173,6 @@ fn test_linux(target: &str) {
// is a private value for kernel usage normally
"FUSE_SUPER_MAGIC" => true,

// Not present on old musl
"PR_SET_VMA"
| "PR_SET_VMA_ANON_NAME"
| "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"
if old_musl =>
{
true
}

// Not present in glibc
"PR_SME_VL_LEN_MAX" | "PR_SME_SET_VL_INHERIT" | "PR_SME_SET_VL_ONE_EXEC" if gnu => true,

Expand Down Expand Up @@ -4359,20 +4357,22 @@ fn test_linux(target: &str) {
// assume it's a int instead.
"getnameinfo" if uclibc => true,

// FIXME(musl): This needs musl 1.2.2 or later.
"gettid" if old_musl => true,
// FIXME(musl): This needs musl 1.2.2 or later, which is newer than what we test with
// on CI.
"gettid" | "reallocarray" if musl => true,
// Needs musl 1.2.3 or later.
"pthread_getname_np" if musl => true,
// Added in musl 1.2.5
"preadv2" | "pwritev2" if musl => true,
// FIXME(musl): Supported in new musl but we don't have a new enough version in CI.
"statx" if musl => true,

// Needs glibc 2.33 or later.
"mallinfo2" => true,

"reallocarray" if old_musl => true,

// Not defined in uclibc as of 1.0.34
"gettid" if uclibc => true,

// Needs musl 1.2.3 or later.
"pthread_getname_np" if old_musl => true,

// There are two versions of basename(3) on Linux with glibc, see
//
// https://man7.org/linux/man-pages/man3/basename.3.html
Expand All @@ -4392,9 +4392,6 @@ fn test_linux(target: &str) {
// FIXME(linux): function pointers changed since Ubuntu 23.10
"strtol" | "strtoll" | "strtoul" | "strtoull" | "fscanf" | "scanf" | "sscanf" => true,

// Added in musl 1.2.5
"preadv2" | "pwritev2" if musl => true,

_ => false,
}
});
Expand Down Expand Up @@ -4506,7 +4503,7 @@ fn test_linux(target: &str) {
// the `xsk_tx_metadata_union` field is an anonymous union
(struct_ == "xsk_tx_metadata" && field == "xsk_tx_metadata_union") ||
// After musl 1.2.0, the type becomes `int` instead of `long`.
(old_musl && struct_ == "utmpx" && field == "ut_session") ||
(musl && struct_ == "utmpx" && field == "ut_session") ||
// `frames` is a flexible array member
(struct_ == "bcm_msg_head" && field == "frames") ||
// FAM
Expand Down