runtime: always rebuild in TestIntendedInlining

This is necessary when you aren't actively changing the runtime. Oops.

Also, run the tests on the builders, to avoid silent failures (#17472).

Change-Id: I1fc03790cdbddddb07026a772137a79919dcaac7
Reviewed-on: https://go-review.googlesource.com/58050
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/runtime/runtime_test.go b/src/runtime/runtime_test.go
index 2355da977436f0adb987effa9ae57e0e699da68c..e1f1be7196bb6ec6b5db1f529258c82b10606225 100644 (file)
--- a/src/runtime/runtime_test.go
+++ b/src/runtime/runtime_test.go
@@ -362,7 +362,7 @@ func TestVersion(t *testing.T) {
 // This allows refactoring for code clarity and re-use without fear that
 // changes to the compiler will cause silent performance regressions.
 func TestIntendedInlining(t *testing.T) {
-       if testing.Short() {
+       if testing.Short() && testenv.Builder() == "" {
                t.Skip("skipping in short mode")
        }
        testenv.MustHaveGoRun(t)
@@ -376,7 +376,7 @@ func TestIntendedInlining(t *testing.T) {
                m[s] = true
        }
 
-       cmd := testEnv(exec.Command(testenv.GoToolPath(t), "build", "-gcflags=-m", "runtime"))
+       cmd := testEnv(exec.Command(testenv.GoToolPath(t), "build", "-a", "-gcflags=-m", "runtime"))
        out, err := cmd.CombinedOutput()
        if err != nil {
                t.Logf("%s", out)