cmd/link: ensure cgo cflags do not leak into dwarf tests

cagedmantis · cagedmantis · commit e948d2b73ede · 2020-01-24T19:47:23.000Z
Running the dwarf tests with CGO_CFLAGS set with certain values would cause the test to fail. all.bash would fail when CGO_CFLAGS was set to '-mmacosx-version-min=10.10' because the --macosx-version-min flag is incompatible with some dwarf tests. The change guards against using an unintended flag in the unit test. Updates #35459 Change-Id: Idc9b354aba44fdab424cb0081a4b3ea7a6d0f8e3 Reviewed-on: https://go-review.googlesource.com/c/go/+/216177 Run-TryBot: Carlos Amedee <carlos@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com> Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/cmd/link/dwarf_test.go b/src/cmd/link/dwarf_test.go
@@ -71,6 +71,7 @@ func testDWARF(t *testing.T, buildmode string, expectDWARF bool, env ...string)
 			}
 			cmd.Args = append(cmd.Args, dir)
 			if env != nil {
+				env = append(env, "CGO_CFLAGS=") // ensure CGO_CFLAGS does not contain any flags. Issue #35459
 				cmd.Env = append(os.Environ(), env...)
 			}
 			out, err := cmd.CombinedOutput()

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func testDWARF(t *testing.T, buildmode string, expectDWARF bool, env ...string)`
`71`	`71`	`}`
`72`	`72`	`cmd.Args = append(cmd.Args, dir)`
`73`	`73`	`if env != nil {`
	`74`	`+ env = append(env, "CGO_CFLAGS=") // ensure CGO_CFLAGS does not contain any flags. Issue #35459`
`74`	`75`	`cmd.Env = append(os.Environ(), env...)`
`75`	`76`	`}`
`76`	`77`	`out, err := cmd.CombinedOutput()`