summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 10:31:52 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 10:31:52 +0000
commit6812c1135479958778b00bd8eb096d59e4e86035 (patch)
treec172d64922e7496af9a7272ad0197ad59b177eb2 /tools
parent6a3ba7a320a26ab09cb45ecc5770124b4c32b5c4 (diff)
downloadchromium_src-6812c1135479958778b00bd8eb096d59e4e86035.zip
chromium_src-6812c1135479958778b00bd8eb096d59e4e86035.tar.gz
chromium_src-6812c1135479958778b00bd8eb096d59e4e86035.tar.bz2
Suppress a couple of new Valgrind reports on interactive_ui tests, update the TSan suppression for a benign race in timegm
Also increase the test timeout for the interactive_ui tests BUG=73000,73001,72927 TEST=Memcheck/Reliability goes green TBR=glider Review URL: http://codereview.chromium.org/6529013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/chrome_tests.py2
-rw-r--r--tools/valgrind/memcheck/suppressions.txt23
-rw-r--r--tools/valgrind/tsan/suppressions.txt16
3 files changed, 31 insertions, 10 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index bb36adb..bd59339 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -289,7 +289,7 @@ class ChromeTests:
return self.SimpleTest("chrome", "interactive_ui_tests",
valgrind_test_args=self.UI_VALGRIND_ARGS,
cmd_args=(self.UI_TEST_ARGS +
- ["--test-terminate-timeout=240000"]))
+ ["--test-terminate-timeout=300000"]))
def TestReliability(self):
script_dir = path_utils.ScriptDir()
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index bcf447f..6bb3a6b 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -3732,3 +3732,26 @@
...
fun:_ZNK13ProfileIOData14LazyInitializeEv
}
+{
+ bug_73000
+ Memcheck:Cond
+ fun:clipboard_clipboard_buffer_received
+ ...
+ fun:gtk_text_view_key_press_event
+ fun:_ZN23AutocompleteEditViewGtk14HandleKeyPressEP10_GtkWidgetP12_GdkEventKey
+}
+{
+ bug_73001a
+ Memcheck:Addr4
+ ...
+ fun:_ZN16ObserverListBaseI19TabContentsObserverE8IteratorD1Ev
+ fun:_ZN11TabContents17OnMessageReceivedERKN3IPC7MessageE
+}
+{
+ bug_73001b
+ Memcheck:Addr1
+ fun:memmove
+ ...
+ fun:_ZN16ObserverListBaseI19TabContentsObserverE7CompactEv
+ fun:_ZN16ObserverListBaseI19TabContentsObserverE8IteratorD1Ev
+}
diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt
index 1e8ba4e..5db4deb 100644
--- a/tools/valgrind/tsan/suppressions.txt
+++ b/tools/valgrind/tsan/suppressions.txt
@@ -144,15 +144,6 @@
fun:browser_sync::*
}
-{
- bug_72927
- ThreadSanitizer:Race
- ...
- fun:base::Time::FromExploded*
- ...
- fun:net::CookieMonster::ParseCookieTime*
-}
-
############################
# Benign races
{
@@ -485,6 +476,13 @@
fun:vfprintf
}
+{
+ fun:timegm
+ ThreadSanitizer:Race
+ ...
+ fun:timegm
+}
+
# gethostbyname2_r is thread-safe, however ThreadSanitizer reports races inside it and
# (sometimes) in __nss_* functions below it.
# This may be related to