From 02335cf4131f4eb1869f50f906e993676f7f414a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 27 Oct 2020 21:05:13 -0700 Subject: runtime: move TestNeedmDeadlock to crash_cgo_test.go It requires cgo. Also, skip the test on windows and plan9. For #42207 Change-Id: I8522773f93bc3f9826506a41a08b86a083262e31 Reviewed-on: https://go-review.googlesource.com/c/go/+/265778 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Reviewed-by: Brad Fitzpatrick --- src/runtime/crash_cgo_test.go | 13 +++++++++++++ src/runtime/crash_unix_test.go | 9 --------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go index b200984050..0680d07a32 100644 --- a/src/runtime/crash_cgo_test.go +++ b/src/runtime/crash_cgo_test.go @@ -600,3 +600,16 @@ func TestEINTR(t *testing.T) { t.Fatalf("want %s, got %s\n", want, output) } } + +// Issue #42207. +func TestNeedmDeadlock(t *testing.T) { + switch runtime.GOOS { + case "plan9", "windows": + t.Skipf("no signals on %s", runtime.GOOS) + } + output := runTestProg(t, "testprogcgo", "NeedmDeadlock") + want := "OK\n" + if output != want { + t.Fatalf("want %s, got %s\n", want, output) + } +} diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go index 7aba3d4846..fc87f37408 100644 --- a/src/runtime/crash_unix_test.go +++ b/src/runtime/crash_unix_test.go @@ -358,12 +358,3 @@ func TestSignalM(t *testing.T) { t.Fatalf("signal sent to M %d, but received on M %d", want, got) } } - -// Issue #42207. -func TestNeedmDeadlock(t *testing.T) { - output := runTestProg(t, "testprogcgo", "NeedmDeadlock") - want := "OK\n" - if output != want { - t.Fatalf("want %s, got %s\n", want, output) - } -} -- cgit v1.2.3-54-g00ecf