diff options
-rw-r--r-- | net/data/valgrind/net_unittests.gtest-tsan_mac.txt | 1 | ||||
-rw-r--r-- | tools/valgrind/tsan/ignores_mac.txt | 4 | ||||
-rw-r--r-- | tools/valgrind/tsan/suppressions_mac.txt | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/net/data/valgrind/net_unittests.gtest-tsan_mac.txt b/net/data/valgrind/net_unittests.gtest-tsan_mac.txt index 9e5c0ef..848397e 100644 --- a/net/data/valgrind/net_unittests.gtest-tsan_mac.txt +++ b/net/data/valgrind/net_unittests.gtest-tsan_mac.txt @@ -16,7 +16,6 @@ TCPClientSocketPoolTest.* URLRequestTest.* URLRequestTestHTTP.* URLRequestTestFTP.* -SSLClientSocketTest.* # WebSocketTest tests are extraordinary slow under ThreadSanitizer, # (see http://crbug.com/25392) diff --git a/tools/valgrind/tsan/ignores_mac.txt b/tools/valgrind/tsan/ignores_mac.txt index 104a38c..e1f36fd 100644 --- a/tools/valgrind/tsan/ignores_mac.txt +++ b/tools/valgrind/tsan/ignores_mac.txt @@ -15,3 +15,7 @@ fun:*base*subtle*NoBarrier_CompareAndSwap* # TODO(timurrrr): investigate whether we need to instrument them obj:*/Security* obj:*/libcrypto* +# SensitiveAllocator::free is a part of the Security framework. +# It calls bzero (0xffff0633) which can't be resolved and thus should be +# ignored recursively. +fun_r:*SensitiveAllocator*free* diff --git a/tools/valgrind/tsan/suppressions_mac.txt b/tools/valgrind/tsan/suppressions_mac.txt index 62a51821..5dd6937 100644 --- a/tools/valgrind/tsan/suppressions_mac.txt +++ b/tools/valgrind/tsan/suppressions_mac.txt @@ -64,6 +64,14 @@ fun:-[NSOperationQueue dealloc] } +{ + Another race deallocating NSOperationQueue + ThreadSanitizer:Race + ... + fun:-[NSIndexSet dealloc] + fun:-[NSOperationQueue dealloc] +} + # A related OpenRadar bug is at http://openradar.appspot.com/7396501. { A benign race on a debug counter in __NSAutoreleaseObject |