From: David du Colombier <0intro@gmail.com> Date: Sat, 7 Jul 2018 23:05:18 +0000 (+0200) Subject: runtime: fix TestAbort on Plan 9 X-Git-Tag: go1.11beta2~192 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b001ffb864ce5486c6edbe98202d3e0687313ce2;p=gostls13.git runtime: fix TestAbort on Plan 9 Since CL 122515, TestAbort is failing on Plan 9 because there is no SIGTRAP signal on Plan 9, but a note containing the "sys: breakpoint" string. This change fixes the TestAbort test by handling the Plan 9 case. Fixes #26265. Change-Id: I2fae00130bcee1cf946d8cc9d147a77f951be390 Reviewed-on: https://go-review.googlesource.com/122464 Run-TryBot: David du Colombier <0intro@gmail.com> TryBot-Result: Gobot Gobot Reviewed-by: Austin Clements --- diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go index 7eb20f24ea..f1229f154b 100644 --- a/src/runtime/crash_test.go +++ b/src/runtime/crash_test.go @@ -650,7 +650,10 @@ func TestAbort(t *testing.T) { } // Check that it's a breakpoint traceback. want := "SIGTRAP" - if runtime.GOOS == "windows" { + switch runtime.GOOS { + case "plan9": + want = "sys: breakpoint" + case "windows": want = "Exception 0x80000003" } if !strings.Contains(output, want) {