diff options
| author | Ian Lance Taylor <iant@golang.org> | 2017-08-08 15:50:43 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2017-08-15 22:59:26 +0000 |
| commit | a1371756c368e4d85cfb84ac8ffc53180aa4d2f2 (patch) | |
| tree | 43d47f182a06eeee3b89527df0286e047bcd8237 /src | |
| parent | a14a8a3eb99658b6a0856b664cf900c861a2e306 (diff) | |
| download | go-a1371756c368e4d85cfb84ac8ffc53180aa4d2f2.tar.xz | |
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 <thebrokentoaster@gmail.com>
Run-TryBot: Joe Tsai <thebrokentoaster@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/race/output_test.go | 21 | ||||
| -rw-r--r-- | src/testing/testing.go | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/runtime/race/output_test.go b/src/runtime/race/output_test.go index e73e6b3bfc..13dfc33b47 100644 --- a/src/runtime/race/output_test.go +++ b/src/runtime/race/output_test.go @@ -259,4 +259,25 @@ Goroutine [0-9] \(running\) created at: runtime\.newextram\(\) .*/runtime/proc.go:[0-9]+ \+0x[0-9,a-f]+ ==================`}, + {"second_test_passes", "test", "", "atexit_sleep_ms=0", ` +package main_test +import "testing" +func TestFail(t *testing.T) { + done := make(chan bool) + x := 0 + go func() { + x = 42 + done <- true + }() + x = 43 + <-done +} + +func TestPass(t *testing.T) { +} +`, ` +================== +--- FAIL: TestFail \(0...s\) +.*testing.go:.*: race detected during execution of test +FAIL`}, } 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") } |