diff options
| author | Ian Lance Taylor <iant@golang.org> | 2017-07-12 20:51:15 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2017-07-13 04:07:39 +0000 |
| commit | 7e172509d96db8cc3d0fb58ab4389b9785307d2c (patch) | |
| tree | c5bd2ea40dc1beb535e4add67d6f4e723742f569 /src/runtime/crash_cgo_test.go | |
| parent | 75f1de8329e8c0873d24397c29de31cf8f08ede5 (diff) | |
| download | go-7e172509d96db8cc3d0fb58ab4389b9785307d2c.tar.gz go-7e172509d96db8cc3d0fb58ab4389b9785307d2c.zip | |
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>
Diffstat (limited to 'src/runtime/crash_cgo_test.go')
| -rw-r--r-- | src/runtime/crash_cgo_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
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 } |