qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 17:07:09 -07:00
Code Releases Activity

cmd/go: fix TestScript/gotoolchain* when go.env doesn't set GOTOOLCHAIN=auto

Browse Source 
Some of the TestScript/gotoolchain* tests assume that go.env contains
GOTOOLCHAIN=auto, but that's not always the case, for example CI
environments may set it to `local` to avoid downloading a new toolchain.

This commit fixes the tests to work regardless of the value of
GOTOOLCHAIN in go.env.

Fixes #60685

Change-Id: Ieda22574f8a028893762274cf9db721c9d69bf7e
Reviewed-on: https://go-review.googlesource.com/c/go/+/502035
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Quim Muntal <quimmuntal@gmail.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Eli Bendersky <eliben@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
This commit is contained in:
qmuntal 2023-06-09 10:30:40 +02:00 committed by Gopher Robot
parent 39effbc105
commit 1f11ea6c41
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmd/go/script_test.go
View File

@ -246,6 +246,7 @@ func scriptEnv(srv *vcstest.Server, srvCertFile string) ([]string, error) {
"goversion=" + version,
"CMDGO_TEST_RUN_MAIN=true",
"HGRCPATH=",
"GOTOOLCHAIN=auto",
"newline=\n",
}

8
src/cmd/go/testdata/script/gotoolchain_local.txt vendored
View File

@ -5,14 +5,8 @@
env TESTGO_VERSION=go1.500
env TESTGO_VERSION_SWITCH=switch
# Default setting should be auto
env GOTOOLCHAIN=
go env GOTOOLCHAIN
stdout auto
go env
stdout GOTOOLCHAIN=.?auto.? # maybe quoted
# GOTOOLCHAIN=auto runs default toolchain without a go.mod or go.work
env GOTOOLCHAIN=auto
go version
stdout go1.500