diff options
| author | Caleb Spare <cespare@gmail.com> | 2021-08-28 16:06:43 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-09-16 23:50:23 +0000 |
| commit | 4efdaa7bc7220fad0177842d0009285ca429a823 (patch) | |
| tree | 478323e4724c4134dae1c0f3b9d3d320f618f248 /src/testing/testing.go | |
| parent | e09dcc211a338450d3f680fe39abc13b79ddbb29 (diff) | |
| download | go-4efdaa7bc7220fad0177842d0009285ca429a823.tar.gz go-4efdaa7bc7220fad0177842d0009285ca429a823.zip | |
testing: skip panics when picking the line number for decoration
Fixes #31154
Change-Id: I4cfd98b5e79f1abdc93044fb66855ac2cc0a9a49
Reviewed-on: https://go-review.googlesource.com/c/go/+/345909
Run-TryBot: Caleb Spare <cespare@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Carlos Amedee <carlos@golang.org>
Diffstat (limited to 'src/testing/testing.go')
| -rw-r--r-- | src/testing/testing.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testing/testing.go b/src/testing/testing.go index a19238d31e..2239e01e22 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -483,6 +483,9 @@ func (c *common) frameSkip(skip int) runtime.Frame { var firstFrame, prevFrame, frame runtime.Frame for more := true; more; prevFrame = frame { frame, more = frames.Next() + if frame.Function == "runtime.gopanic" { + continue + } if frame.Function == c.cleanupName { frames = runtime.CallersFrames(c.cleanupPc) continue |