diff options
Diffstat (limited to 'src/testing/testing.go')
| -rw-r--r-- | src/testing/testing.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/testing/testing.go b/src/testing/testing.go index 43ef9eef09..b5305f29cc 100644 --- a/src/testing/testing.go +++ b/src/testing/testing.go @@ -1851,7 +1851,8 @@ func tRunner(t *T, fn func(t *T)) { t.Logf("cleanup panicked with %v", r) } // Flush the output log up to the root before dying. - for root := &t.common; root.parent != nil; root = root.parent { + // Skip this if this *T is a synctest bubble, because we're not a subtest. + for root := &t.common; !root.isSynctest && root.parent != nil; root = root.parent { root.mu.Lock() root.duration += highPrecisionTimeSince(root.start) d := root.duration @@ -2013,7 +2014,7 @@ func (t *T) Run(name string, f func(t *T)) bool { // It is called by synctest.Test, from within an already-created bubble. // //go:linkname testingSynctestTest testing/synctest.testingSynctestTest -func testingSynctestTest(t *T, f func(*T)) { +func testingSynctestTest(t *T, f func(*T)) (ok bool) { if t.cleanupStarted.Load() { panic("testing: synctest.Run called during t.Cleanup") } @@ -2044,6 +2045,7 @@ func testingSynctestTest(t *T, f func(*T)) { // parent tests by one of the subtests. Continue aborting up the chain. runtime.Goexit() } + return !t2.failed } // Deadline reports the time at which the test binary will have |