From cccfb9bcf28fd3c989e2aebaba65760b0c43bb1b Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Mon, 4 May 2020 08:08:39 -0700 Subject: [PATCH] Disable fork-detect tests under TSAN. TSAN can't cope with the pattern of forking and threading here and exits with an error. Change-Id: I3673004b62a45c5e910a4597f89764682a0b8d0a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/41224 Commit-Queue: Adam Langley Commit-Queue: David Benjamin Reviewed-by: David Benjamin --- crypto/fipsmodule/rand/fork_detect_test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/fipsmodule/rand/fork_detect_test.cc b/crypto/fipsmodule/rand/fork_detect_test.cc index 12eed4d9f..ab4851276 100644 --- a/crypto/fipsmodule/rand/fork_detect_test.cc +++ b/crypto/fipsmodule/rand/fork_detect_test.cc @@ -14,7 +14,9 @@ #include -#if defined(OPENSSL_LINUX) +// TSAN cannot cope with this test and complains that "starting new threads +// after multi-threaded fork is not supported". +#if defined(OPENSSL_LINUX) && !defined(OPENSSL_TSAN) #include #include #include @@ -155,4 +157,4 @@ TEST(ForkDetect, Test) { EXPECT_EQ(start, CRYPTO_get_fork_generation()); } -#endif // OPENSSL_LINUX +#endif // OPENSSL_LINUX && !OPENSSL_TSAN