]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: ensure that runtime/cgo is not stale in TestExecBuildX
authorBryan C. Mills <bcmills@google.com>
Tue, 25 Jun 2019 13:17:28 +0000 (09:17 -0400)
committerBryan C. Mills <bcmills@google.com>
Tue, 25 Jun 2019 16:43:17 +0000 (16:43 +0000)
Fixes #29004

Change-Id: Ifc8330b47fbec6f902057cb9b6db44f2c0082056
Reviewed-on: https://go-review.googlesource.com/c/go/+/183838
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
src/cmd/go/go_test.go

index 9d82ac7dc8ee765abccd6628963666428fb9b884..e07f97d0689f834a58a083eeb57fe2500ddcc3ce 100644 (file)
@@ -5061,6 +5061,11 @@ func TestExecBuildX(t *testing.T) {
        tg.tempDir("cache")
        tg.setenv("GOCACHE", tg.path("cache"))
 
+       // Before building our test main.go, ensure that an up-to-date copy of
+       // runtime/cgo is present in the cache. If it isn't, the 'go build' step below
+       // will fail with "can't open import". See golang.org/issue/29004.
+       tg.run("build", "runtime/cgo")
+
        tg.tempFile("main.go", `package main; import "C"; func main() { print("hello") }`)
        src := tg.path("main.go")
        obj := tg.path("main")