From 9c6ecc49ca02c83f3081c30171ab40dd62557342 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Fri, 14 Jan 2022 09:23:25 -0500 Subject: runtime: skip known TestSegv failure mode on linux-mips64le-mengzhuo Also adjust other skips to actually call t.Skip, so that the test correctly shows as skipped instead of passing. For #50605 Change-Id: Ied482f231a879224c5a92e2c47a6b21c1593a7da Reviewed-on: https://go-review.googlesource.com/c/go/+/378554 Trust: Bryan Mills Reviewed-by: Michael Pratt Run-TryBot: Bryan Mills TryBot-Result: Gopher Robot --- src/runtime/crash_cgo_test.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go index abaed40977..6f1265c014 100644 --- a/src/runtime/crash_cgo_test.go +++ b/src/runtime/crash_cgo_test.go @@ -622,17 +622,19 @@ func TestSegv(t *testing.T) { // No runtime errors like "runtime: unknown pc". switch runtime.GOOS { case "darwin", "illumos", "solaris": - // TODO(golang.org/issue/49182): Skip, runtime - // throws while attempting to generate - // traceback. - return + // Runtime sometimes throws when generating the traceback. + testenv.SkipFlaky(t, 49182) case "linux": if runtime.GOARCH == "386" { - // TODO(golang.org/issue/50504): Skip, - // runtime throws while attempting to - // generate traceback from VDSO call - // via asmcgocall. - return + // Runtime throws when generating a traceback from + // a VDSO call via asmcgocall. + testenv.SkipFlaky(t, 50504) + } + if testenv.Builder() == "linux-mips64le-mengzhuo" && strings.Contains(got, "runtime: unknown pc") { + // Runtime sometimes throw "unknown pc" when generating the traceback. + // Curiously, that doesn't seem to happen on the linux-mips64le-rtrk + // builder. + testenv.SkipFlaky(t, 50605) } } nowant := "runtime: " -- cgit v1.2.3-54-g00ecf