cmd/cgo/internal/testnocgo: always run in default configuration

This test is actually intended to test that we can build in -static
mode even without any cgo. That means it's quite harmless to run in
the default build configuration (in addition to running with various
other build configurations).

Change-Id: Ic6cb5c0eaab83f9bd5718aae57d0fdc69afcb8b6
Reviewed-on: https://go-review.googlesource.com/c/go/+/496178
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 40df8c03b8ff043e7f32c9cefe99c1d076c671fd..2a3028aa7ecb31f25520c133d6365362886c3454 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1130,6 +1130,7 @@ func (t *tester) registerCgoTests(heading string) {
 
        cgoTest("auto", "test", "auto", "")
        cgoTest("auto", "testtls", "auto", "")
+       cgoTest("auto", "testnocgo", "auto", "")
 
        // Stub out various buildmode=pie tests  on alpine until 54354 resolved.
        builderName := os.Getenv("GO_BUILDER_NAME")
@@ -1209,7 +1210,6 @@ func (t *tester) registerCgoTests(heading string) {
                                // TODO(#56629): Why does this fail on netbsd-arm?
                                cgoTest("static", "testtls", "external", "static", staticCheck)
                        }
-                       cgoTest("auto", "testnocgo", "auto", "", staticCheck)
                        cgoTest("external", "testnocgo", "external", "", staticCheck)
                        if goos != "android" {
                                cgoTest("static", "testnocgo", "external", "static", staticCheck)