Skip to content

Commit

Permalink
cmd/compile: change ssa test to avoid go run -gcflags=-d=ssa/check/on
Browse files Browse the repository at this point in the history
In the new content-based staleness world, setting -gcflags like this
recompiles all the packages involved in running the program, not just
the "stale" ones. So go run -gcflags=-d=ssa/check/on recompiles
runtime with those flags too, which is not what the test is trying
to check.

Change-Id: I4dbd5bf2970c3a622c01de84bd8aa9d5e9ec5239
Reviewed-on: https://go-review.googlesource.com/74570
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
  • Loading branch information
rsc committed Oct 31, 2017
1 parent 2beb173 commit 4b5018c
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions src/cmd/compile/internal/gc/ssa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,31 @@ func runGenTest(t *testing.T, filename, tmpname string, ev ...string) {

stdout.Reset()
stderr.Reset()
cmd = exec.Command("go", "run", "-gcflags", "-d=ssa/check/on", rungo)
// 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.Stdout = &stdout
cmd.Stderr = &stderr
cmd.Env = append(cmd.Env, ev...)
if err := cmd.Run(); err != nil {
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.Stdout = &stdout
cmd.Stderr = &stderr
cmd.Env = append(cmd.Env, ev...)
err = cmd.Run()
}
if err == nil {
// run
cmd = exec.Command(filepath.Join(tmpdir, "run.exe"))
cmd.Stdout = &stdout
cmd.Stderr = &stderr
cmd.Env = append(cmd.Env, ev...)
err = cmd.Run()
}
if err != nil {
t.Fatalf("Failed: %v:\nOut: %s\nStderr: %s\n", err, &stdout, &stderr)
}
if s := stderr.String(); s != "" {
Expand All @@ -82,7 +102,6 @@ func runGenTest(t *testing.T, filename, tmpname string, ev ...string) {
if s := stdout.String(); s != "" {
t.Errorf("Stdout = %s\nWant empty", s)
}

}

func TestGenFlowGraph(t *testing.T) {
Expand Down

0 comments on commit 4b5018c

Please sign in to comment.