testing: fix Cleanup race with Logf and Errorf

Fixes #40908

Change-Id: I25561a3f18e730a50e6fbf85aa7bd85bf1b73b6e
Reviewed-on: https://go-review.googlesource.com/c/go/+/250078
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Michał Łowicki 2020-08-23 23:53:04 +01:00 committed by Bryan C. Mills
parent 8d31ca255b
commit 00a053bd4b
2 changed files with 25 additions and 0 deletions

View file

@ -860,11 +860,15 @@ func (c *common) Cleanup(f func()) {
c.cleanup = func() {
if oldCleanup != nil {
defer func() {
c.mu.Lock()
c.cleanupPc = oldCleanupPc
c.mu.Unlock()
oldCleanup()
}()
}
c.mu.Lock()
c.cleanupName = callerName(0)
c.mu.Unlock()
f()
}
var pc [maxStackLen]uintptr