Skip to content

Commit

Permalink
tests: Ensure all tests in the workspace are run
Browse files Browse the repository at this point in the history
Specifically, this should ensure that unit tests in the `libc` crate
don't get missed.

(backport <rust-lang#4151>)
(cherry picked from commit f553033)
  • Loading branch information
tgross35 committed Nov 26, 2024
1 parent 795e59a commit 83490a7
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,15 @@ cmd="cargo test --target $target ${LIBC_CI_ZBUILD_STD+"-Zbuild-std"}"

# Run tests in the `libc` crate
case "$target" in
# Only run `libc-test`
# FIXME(android): unit tests fail to start on Android
# FIXME(s390x): unit tests fail to locate glibc
*android*) ;;
*s390x*) ;;
*) $cmd
*android*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
*s390x*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
# For all other platforms, test everything in the workspace
*) cmd="$cmd --workspace"
esac

# Everything else is in `libc-test`
cmd="$cmd --manifest-path libc-test/Cargo.toml"

if [ "$target" = "s390x-unknown-linux-gnu" ]; then
# FIXME: s390x-unknown-linux-gnu often fails to test due to timeout,
# so we retry this N times.
Expand Down

0 comments on commit 83490a7

Please sign in to comment.