]> Cypherpunks repositories - gostls13.git/commitdiff
runtime/race: reject runtime fatal error in tests
authorCherry Zhang <cherryyz@google.com>
Sat, 14 Nov 2020 19:29:31 +0000 (14:29 -0500)
committerCherry Zhang <cherryyz@google.com>
Mon, 16 Nov 2020 17:27:26 +0000 (17:27 +0000)
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 <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/runtime/race/race_test.go

index a0b8531b42e43ef1021bfec440f7039e1750cd28..d433af6bd0236d1e342ed7f3f7f20fe1255dcc9a 100644 (file)
@@ -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
 }