diff options
| author | Hiroshi Ioka <hirochachacha@gmail.com> | 2017-09-19 18:18:09 +0900 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2017-09-20 03:54:16 +0000 |
| commit | fb54abe9ce3cbec6d464c238406b05502cb34eeb (patch) | |
| tree | 596ae2eb647e4c2b0b1d023ede6c85d5a55099b7 /src/cmd/api/goapi_test.go | |
| parent | 88ced021907fb96d5609a3c63db0d9738bf0ac2b (diff) | |
| download | go-git-fb54abe9ce3cbec6d464c238406b05502cb34eeb.tar.gz | |
all: correct location of go tool
In general, there are no guarantee that `go` command exist on $PATH.
This CL tries to get `go` command from $GOROOT/bin instead.
There are three kinds of code we should handle:
For normal code, the CL implements goCmd() or goCmdName().
For unit tests, the CL uses testenv.GoTool() or testenv.GoToolPath().
For integration tests, the CL sets PATH=$GOROOT/bin:$PATH in cmd/dist.
Note that make.bash sets PATH=$GOROOT/bin:$PATH in the build process.
So this change is only useful when we use toolchain manually.
Updates #21875
Change-Id: I963b9f22ea732dd735363ececde4cf94a5db5ca2
Reviewed-on: https://go-review.googlesource.com/64650
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/api/goapi_test.go')
| -rw-r--r-- | src/cmd/api/goapi_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/api/goapi_test.go b/src/cmd/api/goapi_test.go index 0d00f6a297..3c4e50a21a 100644 --- a/src/cmd/api/goapi_test.go +++ b/src/cmd/api/goapi_test.go @@ -9,6 +9,7 @@ import ( "flag" "fmt" "go/build" + "internal/testenv" "io/ioutil" "os" "os/exec" @@ -163,7 +164,7 @@ func TestSkipInternal(t *testing.T) { } func BenchmarkAll(b *testing.B) { - stds, err := exec.Command("go", "list", "std").Output() + stds, err := exec.Command(testenv.GoToolPath(b), "list", "std").Output() if err != nil { b.Fatal(err) } |