summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 11:20:49 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-03 11:20:49 +0000
commit2df3a626096d4ea1d24da1c1898dd1ee2eb1a235 (patch)
tree13774d171d6ac2ebccfe7d14c20a3f104115dfc8 /tools
parenta15533a05ffc7b8b0ad858c71bbb394c7c0d5e61 (diff)
downloadchromium_src-2df3a626096d4ea1d24da1c1898dd1ee2eb1a235.zip
chromium_src-2df3a626096d4ea1d24da1c1898dd1ee2eb1a235.tar.gz
chromium_src-2df3a626096d4ea1d24da1c1898dd1ee2eb1a235.tar.bz2
Clean up the interactive_ui_tests TSan bot
Widen some suppression, add general Histogram suppression (hope the other ones will be unused then); exclude some tests. BUG=163880 TBR=glider NOTRY=true Review URL: https://codereview.chromium.org/11419286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt11
-rw-r--r--tools/valgrind/tsan/suppressions.txt19
2 files changed, 29 insertions, 1 deletions
diff --git a/tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt b/tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt
index 6cf35d9..dab70da 100644
--- a/tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/interactive_ui_tests.gtest.txt
@@ -19,3 +19,14 @@ BrowserFocusTest.FocusTraversalOnInterstitial
# Fails under Valgrind, see http://crbug.com/68068
DevToolsSanityTest.TestPauseWhenScriptIsRunning
+
+# These tests time out under Valgrind, see http://crbug.com/163880
+BrowserFocusTest.FocusOnReload
+CommandsApiTest.Basic
+ExtensionApiTest.NotificationsHasPermissionManifest
+ExtensionCrashRecoveryTest.ReloadTabsWithBackgroundPage
+ExtensionCrashRecoveryTest.TwoExtensionsCrashBothAtOnce
+ExtensionCrashRecoveryTest.TwoExtensionsCrashFirst
+ExtensionCrashRecoveryTest.TwoExtensionsOneByOne
+FullscreenControllerInteractiveTest.TestTabExitsMouseLockOnNavigation
+OmniboxViewTest.Escape
diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt
index 4a5e505..3dd9e11 100644
--- a/tools/valgrind/tsan/suppressions.txt
+++ b/tools/valgrind/tsan/suppressions.txt
@@ -354,6 +354,23 @@
}
{
+ benign race on Histogram::Add
+ ThreadSanitizer:Race
+ ...
+ fun:base::SampleVector::Accumulate
+ fun:base::Histogram::Add
+}
+
+{
+ benign race on Histogram::SnapshotSamples
+ ThreadSanitizer:Race
+ ...
+ fun:base::HistogramSamples::Add
+ fun:base::Histogram::SnapshotSampleVector
+ fun:base::Histogram::SnapshotSamples
+}
+
+{
bug_62694 [benign races in Histogram in CookieMonster]
ThreadSanitizer:Race
...
@@ -744,7 +761,7 @@
bug_106196
ThreadSanitizer:Race
fun:tracked_objects::ThreadData::InitializeAndSetTrackingStatus
- fun:ChildThread::OnSetProfilerStatus
+ fun:*ChildThread::OnSetProfilerStatus
fun:DispatchToMethod
}
{