diff options
Diffstat (limited to 'src/runtime/proc_test.go')
| -rw-r--r-- | src/runtime/proc_test.go | 10 |
1 files changed, 8 insertions, 2 deletions
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) |