From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 20 Apr 2020 18:06:21 +0000 (-0700)
Subject: runtime: skip TestBigGOMAXPROCS if it runs out of memory
X-Git-Tag: go1.15beta1~483
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2edd351b92ca22581ffc75c9ff47c99bc9d9ea06;p=gostls13.git

runtime: skip TestBigGOMAXPROCS if it runs out of memory

Fixes #38541

Change-Id: I0e9ea5865628d953c32f3a5d4b3ccf1c1d0b081e
Reviewed-on: https://go-review.googlesource.com/c/go/+/229077
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/runtime/proc_test.go b/src/runtime/proc_test.go
index 27dba95eff..764a279fca 100644
--- a/src/runtime/proc_test.go
+++ b/src/runtime/proc_test.go
@@ -1043,8 +1043,14 @@ loop:
 func TestBigGOMAXPROCS(t *testing.T) {
 	t.Parallel()
 	output := runTestProg(t, "testprog", "NonexistentTest", "GOMAXPROCS=1024")
-	if strings.Contains(output, "failed to create new OS thread") {
-		t.Skipf("failed to create 1024 threads")
+	// Ignore error conditions on small machines.
+	for _, errstr := range []string{
+		"failed to create new OS thread",
+		"cannot allocate memory",
+	} {
+		if strings.Contains(output, errstr) {
+			t.Skipf("failed to create 1024 threads")
+		}
 	}
 	if !strings.Contains(output, "unknown function: NonexistentTest") {
 		t.Errorf("output:\n%s\nwanted:\nunknown function: NonexistentTest", output)