about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTrevor Gross <tmgross@umich.edu>2025-04-20 07:26:43 +0000
committerTrevor Gross <t.gross35@gmail.com>2025-04-20 04:11:53 -0400
commita829d916b5555a5ef65d521e98488f32b5476d36 (patch)
tree01408654bcbc41c3ce46ec75a9fe4c6e243d9e0b
parent22f44df8bdf6588236ab7523bb3e35b08df5f750 (diff)
downloadrust-a829d916b5555a5ef65d521e98488f32b5476d36.tar.gz
rust-a829d916b5555a5ef65d521e98488f32b5476d36.zip
ci: Add `/cargo/bin` to the path in Docker
This makes it possible to use nextest within the container.
-rwxr-xr-xlibrary/compiler-builtins/ci/run-docker.sh2
-rwxr-xr-xlibrary/compiler-builtins/ci/run.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/library/compiler-builtins/ci/run-docker.sh b/library/compiler-builtins/ci/run-docker.sh
index d07e7784c9a..c4d3af55ddc 100755
--- a/library/compiler-builtins/ci/run-docker.sh
+++ b/library/compiler-builtins/ci/run-docker.sh
@@ -50,7 +50,7 @@ run() {
             -v "$(pwd)/target:/builtins-target"
             -v "$(rustc --print sysroot):/rust:ro"
         )
-        run_cmd="$run_cmd PATH=\$PATH:/rust/bin"
+        run_cmd="$run_cmd PATH=\$PATH:/rust/bin:/cargo/bin"
     else
         # Use rustc provided by a docker image
         docker volume create compiler-builtins-cache
diff --git a/library/compiler-builtins/ci/run.sh b/library/compiler-builtins/ci/run.sh
index 730079be789..0ad99da19f0 100755
--- a/library/compiler-builtins/ci/run.sh
+++ b/library/compiler-builtins/ci/run.sh
@@ -229,7 +229,6 @@ esac
 # Make sure a simple build works
 cargo check -p libm --no-default-features --target "$target"
 
-
 if [ "${BUILD_ONLY:-}" = "1" ]; then
     # If we are on targets that can't run tests, verify that we can build.
     cmd=(cargo build --target "$target" --package libm)
@@ -255,6 +254,9 @@ else
             cmd+=(--config-file "$cfg_file")
         fi
 
+        # Not all configurations have tests to run on wasm
+        [[ "$target" = *"wasm"* ]] && cmd+=(--no-tests=warn)
+
         cmd+=("${mflags[@]}")
         profile_flag="--cargo-profile"
     fi