summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 16:03:15 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 16:03:15 +0000
commitc0591e5a622fd3e573ebf03e95d1ab2d7d3c265f (patch)
tree2670edcdc4365d3e91c699767ac59efe10cf4c07
parent699e1cd56df7b6f775601c80e99d26f83162a412 (diff)
downloadchromium_src-c0591e5a622fd3e573ebf03e95d1ab2d7d3c265f.zip
chromium_src-c0591e5a622fd3e573ebf03e95d1ab2d7d3c265f.tar.gz
chromium_src-c0591e5a622fd3e573ebf03e95d1ab2d7d3c265f.tar.bz2
Enable SSLClientSocketTest.* on Mac under ThreadSanitizer.
Ignore the accesses within SensitiveAllocator::free. Suppress another report in -[NSOperationQueue dealloc] TBR=timurrrr Review URL: http://codereview.chromium.org/1281001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42472 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/data/valgrind/net_unittests.gtest-tsan_mac.txt1
-rw-r--r--tools/valgrind/tsan/ignores_mac.txt4
-rw-r--r--tools/valgrind/tsan/suppressions_mac.txt8
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