From 7acd1807dd6899441cff9e1246155379971352fb Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Tue, 21 Sep 2021 18:32:26 -0700 Subject: [PATCH] [Sanitizer] Modify test to avoid bot timeouts Change the mutex type to one that initializes on construction and hopefully avoid what appear to be deadlock failures in the new test on a couple bots, e.g.: https://green.lab.llvm.org/green/job/clang-stage1-RA/24140/testReport/SanitizerCommon-Unit/__Sanitizer-x86_64-Test/SanitizerCommon_ReportFile/ --- compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp index 97737e2a1fc2..15612bb3b2cf 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_libc_test.cpp @@ -328,7 +328,7 @@ TEST(SanitizerCommon, InternalMmapWithOffset) { #endif TEST(SanitizerCommon, ReportFile) { - StaticSpinMutex report_file_mu; + SpinMutex report_file_mu; ReportFile report_file = {&report_file_mu, kStderrFd, "", "", 0}; char tmpfile[128]; temp_file_name(tmpfile, sizeof(tmpfile),