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

cmd/go: forward the MallocNanoZone variable to script tests

For #49138
Fixes #49723

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>
---

diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
index 98c1b68ed9..101195fc9d 100644
--- a/src/cmd/go/script_test.go
+++ b/src/cmd/go/script_test.go
@@ -146,6 +146,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.