From 989cc80167e0ec4e8c220f1aec308dbdf4b9b0e9 Mon Sep 17 00:00:00 2001 From: Keith Randall Date: Sat, 4 Nov 2017 14:09:50 -0700 Subject: [PATCH] cmd/compile: fix test to use correct go binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use internal/testenv package to get the right go binary. Otherwise, I think we're just grabbing an old one from the environment. Fixes #22560. Change-Id: Id5b743b24717e15ec8ffbcfae4dc3e5f6a87b9a9 Reviewed-on: https://go-review.googlesource.com/76090 Run-TryBot: Keith Randall TryBot-Result: Gobot Gobot Reviewed-by: Daniel Martí Reviewed-by: David Chase --- src/cmd/compile/internal/gc/ssa_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cmd/compile/internal/gc/ssa_test.go b/src/cmd/compile/internal/gc/ssa_test.go index 3b1a4545a0..40d80e6aba 100644 --- a/src/cmd/compile/internal/gc/ssa_test.go +++ b/src/cmd/compile/internal/gc/ssa_test.go @@ -48,8 +48,9 @@ func doTest(t *testing.T, filename string, kind string) { // of the generated test. func runGenTest(t *testing.T, filename, tmpname string, ev ...string) { testenv.MustHaveGoRun(t) + gotool := testenv.GoToolPath(t) var stdout, stderr bytes.Buffer - cmd := exec.Command("go", "run", filepath.Join("testdata", filename)) + cmd := exec.Command(gotool, "run", filepath.Join("testdata", filename)) cmd.Stdout = &stdout cmd.Stderr = &stderr if err := cmd.Run(); err != nil { @@ -72,14 +73,14 @@ func runGenTest(t *testing.T, filename, tmpname string, ev ...string) { // Execute compile+link+run instead of "go run" to avoid applying -gcflags=-d=ssa/check/on // to the runtime (especially over and over and over). // compile - cmd = exec.Command("go", "tool", "compile", "-d=ssa/check/on", "-o", filepath.Join(tmpdir, "run.a"), rungo) + cmd = exec.Command(gotool, "tool", "compile", "-d=ssa/check/on", "-o", filepath.Join(tmpdir, "run.a"), rungo) cmd.Stdout = &stdout cmd.Stderr = &stderr cmd.Env = append(cmd.Env, ev...) err := cmd.Run() if err == nil { // link - cmd = exec.Command("go", "tool", "link", "-o", filepath.Join(tmpdir, "run.exe"), filepath.Join(tmpdir, "run.a")) + cmd = exec.Command(gotool, "tool", "link", "-o", filepath.Join(tmpdir, "run.exe"), filepath.Join(tmpdir, "run.a")) cmd.Stdout = &stdout cmd.Stderr = &stderr cmd.Env = append(cmd.Env, ev...)