diff options
| author | Caleb Spare <cespare@gmail.com> | 2017-04-06 18:47:01 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2017-04-10 14:36:02 +0000 |
| commit | 221541ec8c4ec1b0ed0c6f26f5e13ca128e2a3cd (patch) | |
| tree | f9ab4f43a0153353ddd2d8954a6cc9eab35da05b /src/testing | |
| parent | 87bd0b2f142283ce3ee49d06074728b0ca900819 (diff) | |
| download | go-221541ec8c4ec1b0ed0c6f26f5e13ca128e2a3cd.tar.xz | |
testing: consider a test failed after race errors
Fixes #19851.
Change-Id: I5ee9533406542be7d5418df154f6134139e75892
Reviewed-on: https://go-review.googlesource.com/39890
Run-TryBot: Caleb Spare <cespare@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/testing')
| -rw-r--r-- | src/testing/testing.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testing/testing.go b/src/testing/testing.go index d63d5d85a7..130977f106 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -450,8 +450,9 @@ func (c *common) Fail() { // Failed reports whether the function has failed. func (c *common) Failed() bool { c.mu.RLock() - defer c.mu.RUnlock() - return c.failed + failed := c.failed + c.mu.RUnlock() + return failed || c.raceErrors+race.Errors() > 0 } // FailNow marks the function as having failed and stops its execution. |