Skip to content
Closed
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
23 changes: 1 addition & 22 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,6 @@ jobs:
- target: i686-pc-windows-msvc
os: windows-2025
- target: i686-unknown-linux-gnu
- target: i686-unknown-linux-gnu
artifact-tag: offset-bits64
env: { RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64 }
- target: i686-unknown-linux-gnu
artifact-tag: time-bits64
env: { RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64 }
- target: x86_64-pc-windows-gnu
os: windows-2025
env: { ARCH_BITS: 64, ARCH: x86_64 }
Expand Down Expand Up @@ -189,12 +183,6 @@ jobs:
artifact-tag: new-musl
- target: arm-linux-androideabi
- target: arm-unknown-linux-gnueabihf
- target: arm-unknown-linux-gnueabihf
env: { RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64 }
artifact-tag: offset-bits64
- target: arm-unknown-linux-gnueabihf
env: { RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64 }
artifact-tag: time-bits64
- target: arm-unknown-linux-musleabihf
- target: arm-unknown-linux-musleabihf
env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
Expand All @@ -210,6 +198,7 @@ jobs:
- target: loongarch64-unknown-linux-musl
env: { RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1 }
artifact-tag: new-musl
- target: powerpc-unknown-linux-gnu
- target: powerpc64-unknown-linux-gnu
- target: powerpc64le-unknown-linux-gnu
- target: powerpc64le-unknown-linux-musl
Expand All @@ -232,16 +221,6 @@ jobs:
artifact-tag: new-musl
# FIXME: It seems some items in `src/unix/mod.rs` aren't defined on redox actually.
# - target: x86_64-unknown-redox

# FIXME(ppc): SIGILL running tests, see
# https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713
# - target: powerpc-unknown-linux-gnu
# - target: powerpc-unknown-linux-gnu
# env: { RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64 }
# artifact-tag: offset-bits64
# - target: powerpc-unknown-linux-gnu
# env: { RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64 }
# artifact-tag: time-bits64
runs-on: ${{ matrix.os && matrix.os || 'ubuntu-24.04' }}
timeout-minutes: 25
env:
Expand Down
12 changes: 12 additions & 0 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,21 @@ case "$target" in
*loongarch*) cmd="$cmd --exclude ctest --exclude ctest-test --exclude ctest-next" ;;
esac

env="$(rustc --print cfg --target "$target" | sed -n 's/target_env="\(.*\)"/\1/p')"
bits="$(rustc --print cfg --target "$target" | sed -n 's/target_pointer_width="\(.*\)"/\1/p')"

# shellcheck disable=SC2086
$cmd --no-default-features -- $test_flags
# shellcheck disable=SC2086
$cmd -- $test_flags
# shellcheck disable=SC2086
$cmd --features extra_traits -- $test_flags

# On relevant platforms, also test with our optional settings

if [ "$env" = "gnu" ] && [ "$bits" = "32" ]; then
# shellcheck disable=SC2086
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS=64 $cmd -- $test_flags
# shellcheck disable=SC2086
RUST_LIBC_UNSTABLE_GNU_TIME_BITS=64 $cmd -- $test_flags
fi
3 changes: 2 additions & 1 deletion libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3499,6 +3499,7 @@ fn test_linux(target: &str) {
let aarch64 = target.contains("aarch64");
let i686 = target.contains("i686");
let ppc = target.contains("powerpc");
let ppc32 = target.contains("powerpc-");
let ppc64 = target.contains("powerpc64");
let s390x = target.contains("s390x");
let sparc64 = target.contains("sparc64");
Expand Down Expand Up @@ -4213,7 +4214,7 @@ fn test_linux(target: &str) {
"XDP_USE_SG" | "XDP_PKT_CONTD" => true,

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

// FIXME(linux): Requires >= 6.8 kernel headers.
"XDP_UMEM_TX_SW_CSUM"
Expand Down
Loading