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

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>

diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
index a2c1087bd81d3e0d645bebcccb99d04f7faf6446..d0099888d9cc44603136adba86e5b28e55bc5386 100644 (file)
--- a/src/cmd/go/script_test.go
+++ b/src/cmd/go/script_test.go
@@ -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",
        }
 

diff --git a/src/cmd/go/testdata/script/gotoolchain_local.txt b/src/cmd/go/testdata/script/gotoolchain_local.txt
index 313c541501576468007071f4081390770650d2a1..0e08207f451714cf6c0b4dd49573cb0899193d77 100644 (file)
--- a/src/cmd/go/testdata/script/gotoolchain_local.txt
+++ b/src/cmd/go/testdata/script/gotoolchain_local.txt
@@ -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