aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2021-11-22 14:01:26 -0500
committerHeschi Kreinick <heschi@google.com>2021-11-22 20:49:23 +0000
commit7da96592c4d1d92984cef3be6c5cc66c288fc79b (patch)
tree2308acb17d35d9f8400a9da2f3b671d3ecc50625
parent3729a67f31204de702c2458b85828b4aba047676 (diff)
downloadgo-7da96592c4d1d92984cef3be6c5cc66c288fc79b.tar.gz
go-7da96592c4d1d92984cef3be6c5cc66c288fc79b.zip
[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>
-rw-r--r--src/cmd/go/script_test.go1
1 files changed, 1 insertions, 0 deletions
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.