diff options
| -rw-r--r-- | tools/heapcheck/heapcheck_test.py | 2 | ||||
| -rw-r--r-- | tools/valgrind/tsan/suppressions.txt | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/heapcheck/heapcheck_test.py b/tools/heapcheck/heapcheck_test.py index 937444c..86fa378 100644 --- a/tools/heapcheck/heapcheck_test.py +++ b/tools/heapcheck/heapcheck_test.py @@ -24,7 +24,7 @@ class HeapcheckWrapper(object): def __init__(self, supp_files): self._mode = 'strict' - self._timeout = 1200 + self._timeout = 1800 self._nocleanup_on_exit = False self._suppressions = [] for fname in supp_files: diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index 65be2c1..112fed7 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -1010,6 +1010,13 @@ fun:base::internal::RunnableAdapter::Run } { + bug_137973_c + ThreadSanitizer:Race + fun:media::Pipeline::SetState + fun:media::Pipeline::TeardownStateTransitionTask + fun:base::internal::RunnableAdapter::Run +} +{ bug_138691 ThreadSanitizer:Race ... |