From 83f21eaa6473ad57900d2aab32c488328c212660 Mon Sep 17 00:00:00 2001 From: cxymds Date: Wed, 29 Jul 2026 22:27:20 +0800 Subject: [PATCH] test(entrypoint): preserve cargo toolchain environment (#5385) Co-authored-by: houseme --- scripts/test_entrypoint_credentials.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/test_entrypoint_credentials.sh b/scripts/test_entrypoint_credentials.sh index 7d3cc4e71..756dcf03d 100755 --- a/scripts/test_entrypoint_credentials.sh +++ b/scripts/test_entrypoint_credentials.sh @@ -226,7 +226,11 @@ run_cli_expect_failure \ # Non-server commands skip credential validation entirely. cargo_log="$TMP_DIR/cargo.log" -if ! env -i PATH="$PATH" RUSTFS_VOLUMES="$TMP_DIR/data" RUSTFS_OBS_LOG_DIRECTORY= sh "$ENTRYPOINT" cargo --version >"$cargo_log" 2>&1; then +toolchain_env=(PATH="$PATH") +[ "${HOME+x}" = x ] && toolchain_env+=(HOME="$HOME") +[ "${CARGO_HOME+x}" = x ] && toolchain_env+=(CARGO_HOME="$CARGO_HOME") +[ "${RUSTUP_HOME+x}" = x ] && toolchain_env+=(RUSTUP_HOME="$RUSTUP_HOME") +if ! env -i "${toolchain_env[@]}" RUSTFS_VOLUMES="$TMP_DIR/data" RUSTFS_OBS_LOG_DIRECTORY= sh "$ENTRYPOINT" cargo --version >"$cargo_log" 2>&1; then echo "Expected cargo passthrough to skip server credential checks" >&2 cat "$cargo_log" >&2 exit 1