From: Michael Pratt <mpratt@google.com>
Date: Wed, 9 Mar 2022 22:08:37 +0000 (-0500)
Subject: runtime: fix SegvInCgo skip check
X-Git-Tag: go1.19beta1~1100
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1cf67709beb2d7e317cb6e6b983f3fc6304ebc1a;p=gostls13.git

runtime: fix SegvInCgo skip check

CL 390034 changed this throw message to add the goid, breaking the
match.

For #50979.

Change-Id: I52d97695484938701e5b7c269e2caf0c87d44d7a
Reviewed-on: https://go-review.googlesource.com/c/go/+/391139
Trust: Michael Pratt <mpratt@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
---

diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
index 37509b1292..5e58712297 100644
--- a/src/runtime/crash_cgo_test.go
+++ b/src/runtime/crash_cgo_test.go
@@ -629,7 +629,7 @@ func TestSegv(t *testing.T) {
 					testenv.SkipFlaky(t, 50504)
 				}
 			}
-			if test == "SegvInCgo" && strings.Contains(got, "runtime: unknown pc") {
+			if test == "SegvInCgo" && strings.Contains(got, "unknown pc") {
 				testenv.SkipFlaky(t, 50979)
 			}