cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

internal/testenv: reject the resolved 'go' command if it does not match runtime.GOROOT

Browse Source 
Many tests in x/tools invoke the 'go' command found from $PATH.
If that command does not match the 'go' command used to invoke 'go test',
the result will be misleading.

Instead of silently accepting the mismatched result, check the 'go'
tool's self-reported GOROOT and reject it if it doesn't match the 'go'
tool used to invoke 'go test'.

That rejection will cause the x/tools tests to fail if x/tools is the main module.

Updates golang/go#35505

Change-Id: I581906468ef736fad42a0164376a07f876907621
Reviewed-on: https://go-review.googlesource.com/c/tools/+/206517
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
This commit is contained in:
Bryan C. Mills 2019-11-11 14:03:26 -05:00
parent 50fa39b762
commit 7dd52f0964
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/testenv/testenv.go
View File

@ -13,6 +13,7 @@ import (
"os/exec" "os/exec"
"runtime" "runtime"
"strings" "strings"
"sync"
) )
// Testing is an abstraction of a *testing.T. // Testing is an abstraction of a *testing.T.
@ -32,11 +33,17 @@ type helperer interface {
// be development versions. // be development versions.
var packageMainIsDevel = func() bool { return true } var packageMainIsDevel = func() bool { return true }
var checkGoGoroot struct {
once sync.Once
err error
}
func hasTool(tool string) error { func hasTool(tool string) error {
_, err := exec.LookPath(tool) _, err := exec.LookPath(tool)
if err != nil { if err != nil {
return err return err
} }
switch tool { switch tool {
case "patch": case "patch":
// check that the patch tools supports the -o argument // check that the patch tools supports the -o argument
@ -50,7 +57,28 @@ func hasTool(tool string) error {
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return err return err
} }
case "go":
checkGoGoroot.once.Do(func() {
// Ensure that the 'go' command found by exec.LookPath is from the correct
// GOROOT. Otherwise, 'some/path/go test ./...' will test against some
// version of the 'go' binary other than 'some/path/go', which is almost
// certainly not what the user intended.
out, err := exec.Command(tool, "env", "GOROOT").CombinedOutput()
if err != nil {
checkGoGoroot.err = err
return
}
GOROOT := strings.TrimSpace(string(out))
if GOROOT != runtime.GOROOT() {
checkGoGoroot.err = fmt.Errorf("'go env GOROOT' does not match runtime.GOROOT:\n\tgo env: %s\n\tGOROOT: %s", GOROOT, runtime.GOROOT())
}
})
if checkGoGoroot.err != nil {
return checkGoGoroot.err
}
} }
return nil return nil
} }