From: Bryan C. Mills <bcmills@google.com>
Date: Mon, 22 Nov 2021 19:01:26 +0000 (-0500)
Subject: [release-branch.go1.16] cmd/go: forward the MallocNanoZone variable to script tests
X-Git-Tag: go1.16.11~8
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7da96592c4d1d92984cef3be6c5cc66c288fc79b;p=gostls13.git

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

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 189b4a2f428be7264db76e5275c96d98b847383b)
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
index dfaa40548e..2ae30e146e 100644
--- 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.