[release-branch.go1.16] cmd/go: forward the MallocNanoZone variable to script tests

Bryan C. Mills · heschi · commit 7da96592c4d1 · 2021-11-22T20:49:23.000Z
For #49138 Updates #49723 Fixes #49728 Change-Id: Ia93130fdc042a1e2107be95cccd7e7eeaa909a87 Reviewed-on: https://go-review.googlesource.com/c/go/+/366254 Trust: Bryan C. Mills <bcmills@google.com> Run-TryBot: Bryan C. Mills <bcmills@google.com> Reviewed-by: Ian Lance Taylor <iant@golang.org> (cherry picked from commit 189b4a2) Reviewed-on: https://go-review.googlesource.com/c/go/+/366258 TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
@@ -105,6 +105,7 @@ var extraEnvKeys = []string{
 	"GO_TESTING_GOTOOLS", // for gccgo testing
 	"GCCGO",              // for gccgo testing
 	"GCCGOTOOLDIR",       // for gccgo testing
+	"MallocNanoZone",     // Needed to work around an apparent kernel bug in macOS 12; see https://golang.org/issue/49138.
 }
 
 // setup sets up the test execution temporary directory and environment.

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ var extraEnvKeys = []string{`
`105`	`105`	`"GO_TESTING_GOTOOLS", // for gccgo testing`
`106`	`106`	`"GCCGO", // for gccgo testing`
`107`	`107`	`"GCCGOTOOLDIR", // for gccgo testing`
	`108`	`+ "MallocNanoZone", // Needed to work around an apparent kernel bug in macOS 12; see https://golang.org/issue/49138.`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`// setup sets up the test execution temporary directory and environment.`