From a1371756c368e4d85cfb84ac8ffc53180aa4d2f2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 8 Aug 2017 15:50:43 -0700 Subject: testing: don't fail all tests after racy test failure The code was adding race.Errors to t.raceErrors before checking Failed, but Failed was using t.raceErrors+race.Errors. We don't want to change Failed, since that would affect tests themselves, so modify the harness to not unnecessarily change t.raceErrors. Updates #19851 Fixes #21338 Change-Id: I7bfdf281f90e045146c92444f1370d55c45221d4 Reviewed-on: https://go-review.googlesource.com/54050 Reviewed-by: Joe Tsai Run-TryBot: Joe Tsai TryBot-Result: Gobot Gobot --- src/testing/testing.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/testing/testing.go') diff --git a/src/testing/testing.go b/src/testing/testing.go index 02b2d730eb..93297b2dca 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -697,8 +697,7 @@ func tRunner(t *T, fn func(t *T)) { // a call to runtime.Goexit, record the duration and send // a signal saying that the test is done. defer func() { - t.raceErrors += race.Errors() - if t.raceErrors > 0 { + if t.raceErrors+race.Errors() > 0 { t.Errorf("race detected during execution of test") } -- cgit v1.3