summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 19:58:42 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 19:58:42 +0000
commit9c1daf729ceb981ca1650999a15d31d8dc0d1294 (patch)
treef0b0a7b6bec03bab6db4606514ea48b3b5bef6b4 /tools
parentd19c472f0586c0619e5b3240e8b27a25e630fba6 (diff)
downloadchromium_src-9c1daf729ceb981ca1650999a15d31d8dc0d1294.zip
chromium_src-9c1daf729ceb981ca1650999a15d31d8dc0d1294.tar.gz
chromium_src-9c1daf729ceb981ca1650999a15d31d8dc0d1294.tar.bz2
TSAN: Disable SimpleIndexFileTest.WriteThenLoadIndex on Linux TSAN as well. Suppress a race in MediaStreamManagerTest.
BUG=255775,256792 TBR=gavinp@chromium.org,xians@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/18571002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt3
-rw-r--r--tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt3
-rw-r--r--tools/valgrind/tsan/suppressions.txt15
3 files changed, 18 insertions, 3 deletions
diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt
index b3b63d2..a262d2f 100644
--- a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan.txt
@@ -22,3 +22,6 @@ URLRequestTest.FileTest
# http://crbug.com/92439
ServerBoundCertServiceTest.*
+
+# Fails flakily. http://crbug.com/255775
+SimpleIndexFileTest.WriteThenLoadIndex
diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
index 3c39522..d2b9f5d 100644
--- a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
@@ -30,6 +30,3 @@ HostResolverImplTest.StartWithinCallback
# Crash. See crbug.com/234776.
DiskCacheEntryTest.EvictOldEntries
DiskCacheEntryTest.NewEvictionEvictOldEntries
-
-# Fails flakily. http://crbug.com/255775
-SimpleIndexFileTest.WriteThenLoadIndex
diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt
index c0548dc..fb82f47 100644
--- a/tools/valgrind/tsan/suppressions.txt
+++ b/tools/valgrind/tsan/suppressions.txt
@@ -1100,3 +1100,18 @@
...
fun:media::FFmpegVideoDecoder::Decode
}
+{
+ bug_256792
+ ThreadSanitizer:Race
+ fun:media::AudioManagerLinux::~AudioManagerLinux
+ fun:content::MockAudioManager::~MockAudioManager
+ fun:content::MockAudioManager::~MockAudioManager
+ fun:base::DefaultDeleter::operator()
+ fun:base::internal::scoped_ptr_impl::~scoped_ptr_impl
+ fun:scoped_ptr::~scoped_ptr
+ fun:content::MediaStreamManagerTest::~MediaStreamManagerTest
+ fun:content::MediaStreamManagerTest_MakeAndCancelMediaAccessRequest_Test::~MediaStreamManagerTest_MakeAndCancelMediaAccessRequest_Test
+ fun:content::MediaStreamManagerTest_MakeAndCancelMediaAccessRequest_Test::~MediaStreamManagerTest_MakeAndCancelMediaAccessRequest_Test
+ fun:testing::Test::DeleteSelf_
+ fun:testing::internal::HandleSehExceptionsInMethodIfSupported
+}