From d834ecec8637e3d54b67debf95ceb649cc0b4e1d Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Sat, 14 Nov 2020 14:29:31 -0500 Subject: [PATCH] runtime/race: reject runtime fatal error in tests We expect those tests to fail with non-zero exit code, due to intentional races, but we don't expect the runtime to crash. Reject that. Change-Id: Ic37987dabecde5f0703c031c49ce7f884a7b06a5 Reviewed-on: https://go-review.googlesource.com/c/go/+/270398 Trust: Cherry Zhang Run-TryBot: Cherry Zhang TryBot-Result: Go Bot Reviewed-by: Ian Lance Taylor --- src/runtime/race/race_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/runtime/race/race_test.go b/src/runtime/race/race_test.go index a0b8531b42e..d433af6bd02 100644 --- a/src/runtime/race/race_test.go +++ b/src/runtime/race/race_test.go @@ -177,6 +177,10 @@ func runTests(t *testing.T) ([]byte, error) { ) // There are races: we expect tests to fail and the exit code to be non-zero. out, _ := cmd.CombinedOutput() + if bytes.Contains(out, []byte("fatal error:")) { + // But don't expect runtime to crash. + return out, fmt.Errorf("runtime fatal error") + } return out, nil }