From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 13 Jul 2017 03:51:15 +0000 (-0700)
Subject: runtime: don't call t.Parallel in TestCgoSignalDeadlock
X-Git-Tag: go1.9rc1~74
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7e172509d96db8cc3d0fb58ab4389b9785307d2c;p=gostls13.git

runtime: don't call t.Parallel in TestCgoSignalDeadlock

It seems that when too much other code is running on the system,
the testprogcgo code can overrun its timeouts.

Updates #18598.

Not marking the issue as fixed until it doesn't recur for some time.

Change-Id: Ieaf106b41986fdda76b1d027bb9d5e3fb805cc3b
Reviewed-on: https://go-review.googlesource.com/48233
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
index c102608748..a5cbbad69b 100644
--- a/src/runtime/crash_cgo_test.go
+++ b/src/runtime/crash_cgo_test.go
@@ -24,7 +24,10 @@ func TestCgoCrashHandler(t *testing.T) {
 }
 
 func TestCgoSignalDeadlock(t *testing.T) {
-	t.Parallel()
+	// Don't call t.Parallel, since too much work going on at the
+	// same time can cause the testprogcgo code to overrun its
+	// timeouts (issue #18598).
+
 	if testing.Short() && runtime.GOOS == "windows" {
 		t.Skip("Skipping in short mode") // takes up to 64 seconds
 	}