Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,9 @@ jobs:
if: matrix.toolchain == 'stable'
run: ./ci/prep-semver-baseline.sh

# FIXME(ci): These `du` statements are temporary for debugging cache
- name: Target size before restoring cache
run: du -sh target | sort -k 2 || true
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
with:
key: ${{ matrix.os }}-${{ matrix.toolchain }}
- name: Target size after restoring cache
run: du -sh target | sort -k 2 || true

- name: Execute build check
run: |
Expand All @@ -124,8 +119,6 @@ jobs:
${BASELINE_CRATE_DIR:+"--baseline-crate-dir" "$BASELINE_CRATE_DIR"} \
${{ matrix.only && format('--only "{0}"', matrix.only) }} \
${{ matrix.half && format('--half "{0}"', matrix.half) }}
- name: Target size after job completion
run: du -sh target | sort -k 2

test_tier1:
name: Test tier1
Expand Down
14 changes: 6 additions & 8 deletions libc-test/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3940,7 +3940,6 @@ fn test_linux(t: &Target) {
}

let arm32 = t.arm32();
let eabihf = t.eabihf();
let aarch64 = t.aarch64();
let ppc = t.ppc();
let ppc64 = t.ppc64();
Expand Down Expand Up @@ -3969,6 +3968,7 @@ fn test_linux(t: &Target) {
None if l4re => (0, 0),
None => panic!("failed to detect kernel version for Linux target {t:?}",),
};
let glibc = versions.glibc;

let mut musl_v1_2 = env_flag("CARGO_CFG_LIBC_UNSTABLE_MUSL_V1_2");
if musl_v1_2 {
Expand Down Expand Up @@ -4781,9 +4781,6 @@ fn test_linux(t: &Target) {
// FIXME(linux32): Requires >= 6.6 kernel headers.
"XDP_USE_SG" | "XDP_PKT_CONTD" if p32 => kernel < (6, 6),

// FIXME(linux): Missing only on this platform for some reason
"PR_MDWE_NO_INHERIT" if gnueabihf => true,

// FIXME(musl): Not yet in musl
// FIXME(linux32): Requires >= 6.8 kernel headers.
"XDP_UMEM_TX_SW_CSUM"
Expand Down Expand Up @@ -4842,9 +4839,14 @@ fn test_linux(t: &Target) {
"AT_HWCAP3" | "AT_HWCAP4" if old_musl => true,
"AT_HWCAP3" | "AT_HWCAP4" => kernel < (6, 9),
"BCACHEFS_SUPER_MAGIC" => kernel < (6, 10),
"PR_MDWE_NO_INHERIT" => kernel < (6, 7),
"PTRACE_SET_SYSCALL_INFO" => kernel < (6, 16),
"TLS_INFO_TX_MAX_PAYLOAD_LEN" | "TLS_INFO_MAX" => kernel < (6, 19),

// Available in fcntl since kernel 6.5 but we don't import that header, so can only
// get it via recent glibc.
"AT_HANDLE_FID" => kernel < (6, 5) || glibc.is_some_and(|v| v < (2, 39)) || musl,

// statx mask and attribute bits
"STATX_MNT_ID_UNIQUE" => kernel < (6, 8),
"STATX_SUBVOL" => kernel < (6, 10),
Expand All @@ -4864,10 +4866,6 @@ fn test_linux(t: &Target) {
}
}

// FIXME(musl): This value is not yet in musl.
// eabihf targets are tested using an older version of glibc
"AT_HANDLE_FID" if musl || eabihf => true,

// Added in 7.2
"FUTEX_ROBUST_UNLOCK" => kernel < (7, 2),
"FUTEX_ROBUST_LIST32" => kernel < (7, 2),
Expand Down
Loading