diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 14:29:11 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 14:29:11 +0000 |
| commit | 776ba19a48114537f74f03ebd66fc8ff5f0ee0de (patch) | |
| tree | 3a2f9a5eb43c6d868afad7f87c3452724f71adbd | |
| parent | c04a87e737da6e610633b9bf4e270e394b387b05 (diff) | |
| download | chromium_src-776ba19a48114537f74f03ebd66fc8ff5f0ee0de.zip chromium_src-776ba19a48114537f74f03ebd66fc8ff5f0ee0de.tar.gz chromium_src-776ba19a48114537f74f03ebd66fc8ff5f0ee0de.tar.bz2 | |
Read tsan/suppressions_win32.txt too when matching TSan/Win reports
BUG=109991
TBR=glider
TEST=manually crafted a "report" file in tools/valgrind/waterfall.tmp, then
./tools/valgrind/waterfall.sh match with and without a suppression in
tools/valgrind/tsan/suppressions_win32.txt
Review URL: https://chromiumcodereview.appspot.com/9235030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119065 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/valgrind/test_suppressions.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/valgrind/test_suppressions.py b/tools/valgrind/test_suppressions.py index de09756..1492e52 100644 --- a/tools/valgrind/test_suppressions.py +++ b/tools/valgrind/test_suppressions.py @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -63,6 +63,10 @@ def main(argv): tsan_mac = suppressions.ReadSuppressionsFromFile(supp_filename) mac_suppressions = vg_mac + tsan_mac + supp_filename = JOIN(suppressions_root, "tsan", "suppressions_win32.txt") + tsan_win = suppressions.ReadSuppressionsFromFile(supp_filename) + win_suppressions = tsan_win + supp_filename = JOIN(suppressions_root, "..", "heapcheck", "suppressions.txt") heapcheck_suppressions = suppressions.ReadSuppressionsFromFile(supp_filename) @@ -88,6 +92,9 @@ def main(argv): for url in all_reports[r]]): # Include mac suppressions if the report is only present on Mac cur_supp += mac_suppressions + elif all([re.search("Windows%20", url) for url in all_reports[r]]): + # Include win32 suppressions if the report is only present on Windows + cur_supp += win_suppressions elif all([re.search("%20Heapcheck", url) for url in all_reports[r]]): cur_supp += heapcheck_suppressions |