From 83490a705770be5bddf86e476e1734944d480a96 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Tue, 26 Nov 2024 15:36:00 -0500
Subject: [PATCH] tests: Ensure all tests in the workspace are run

Specifically, this should ensure that unit tests in the `libc` crate
don't get missed.

(backport <https://github.com/rust-lang/libc/pull/4151>)
(cherry picked from commit f5530335b91d6c838a007ad5ad980036d519e01a)
---
 ci/run.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ci/run.sh b/ci/run.sh
index 5ac4070d928a..9754118f742b 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -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.