aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2023-09-18 16:49:41 -0400
committerGopher Robot <gobot@golang.org>2023-09-19 16:21:36 +0000
commitb64dc5f499400f1ec3ef0192cc2d42a87a1916a8 (patch)
tree5cdd7bc8ba03cc39127c014d21b5e3dfcee48171
parentcd66ca0636a55d301530c0d766a47f07c5423d0d (diff)
downloadgo-b64dc5f499400f1ec3ef0192cc2d42a87a1916a8.tar.gz
go-b64dc5f499400f1ec3ef0192cc2d42a87a1916a8.zip
[release-branch.go1.21] cmd/go: in TestScript/gotoolchain_path, remove the user's PATH
This test checks a behavior of GOTOOLCHAIN when an appropriate toolchain is found in PATH. That requires it to exclude any suitable toolchain binaries from the user's $PATH, which may otherwise interfere. Fixes #62711. Updates #62709. Change-Id: Ie9161e52d33a65be0b5265cb49e9f2bc8473e057 Reviewed-on: https://go-review.googlesource.com/c/go/+/529217 Auto-Submit: Bryan Mills <bcmills@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> (cherry picked from commit 30886b1b1ea0ff0282419e4deefdd35a51b2c9fc) Reviewed-on: https://go-review.googlesource.com/c/go/+/529435 Run-TryBot: Bryan Mills <bcmills@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
-rw-r--r--src/cmd/go/testdata/script/gotoolchain_path.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/go/testdata/script/gotoolchain_path.txt b/src/cmd/go/testdata/script/gotoolchain_path.txt
index 2549fa4753..9628348f7a 100644
--- a/src/cmd/go/testdata/script/gotoolchain_path.txt
+++ b/src/cmd/go/testdata/script/gotoolchain_path.txt
@@ -8,11 +8,12 @@ env TESTGO_VERSION=go1.21pre3
# Compile a fake toolchain to put in the path under various names.
env GOTOOLCHAIN=
mkdir $WORK/bin
-[!GOOS:plan9] env PATH=$WORK/bin${:}$PATH
-[GOOS:plan9] env path=$WORK/bin${:}$path
go build -o $WORK/bin/ ./fakego.go # adds .exe extension implicitly on Windows
cp $WORK/bin/fakego$GOEXE $WORK/bin/go1.50.0$GOEXE
+[!GOOS:plan9] env PATH=$WORK/bin
+[GOOS:plan9] env path=$WORK/bin
+
go version
stdout go1.21pre3