Index: tools/valgrind/suppressions.py |
diff --git a/tools/valgrind/suppressions.py b/tools/valgrind/suppressions.py |
index a1a0d1e4a4cfe2feb9da655346728bf7d270aa0e..df893ca2eae3797bfc561afc9096bccf3f4aeee3 100755 |
--- a/tools/valgrind/suppressions.py |
+++ b/tools/valgrind/suppressions.py |
@@ -29,9 +29,45 @@ import os |
import re |
import sys |
+import path_utils |
Timur Iskhodzhanov
2012/12/03 11:14:13
Traceback (most recent call last):
File "../depo
|
+ |
+ |
ELLIPSIS = '...' |
+def GetSuppressions(): |
+ suppressions_root = path_utils.ScriptDir() |
+ JOIN = os.path.join |
+ |
+ result = {} |
+ |
+ supp_filename = JOIN(suppressions_root, "memcheck", "suppressions.txt") |
+ vg_common = ReadSuppressionsFromFile(supp_filename) |
+ supp_filename = JOIN(suppressions_root, "tsan", "suppressions.txt") |
+ tsan_common = ReadSuppressionsFromFile(supp_filename) |
+ result['common_suppressions'] = vg_common + tsan_common |
+ |
+ supp_filename = JOIN(suppressions_root, "memcheck", "suppressions_mac.txt") |
+ vg_mac = ReadSuppressionsFromFile(supp_filename) |
+ supp_filename = JOIN(suppressions_root, "tsan", "suppressions_mac.txt") |
+ tsan_mac = ReadSuppressionsFromFile(supp_filename) |
+ result['mac_suppressions'] = vg_mac + tsan_mac |
+ |
+ supp_filename = JOIN(suppressions_root, "tsan", "suppressions_win32.txt") |
+ tsan_win = ReadSuppressionsFromFile(supp_filename) |
+ result['win_suppressions'] = tsan_win |
+ |
+ supp_filename = JOIN(suppressions_root, "..", "heapcheck", "suppressions.txt") |
+ result['heapcheck_suppressions'] = ReadSuppressionsFromFile(supp_filename) |
+ |
+ supp_filename = JOIN(suppressions_root, "drmemory", "suppressions.txt") |
+ result['drmem_suppressions'] = ReadSuppressionsFromFile(supp_filename) |
+ supp_filename = JOIN(suppressions_root, "drmemory", "suppressions_full.txt") |
+ result['drmem_full_suppressions'] = ReadSuppressionsFromFile(supp_filename) |
+ |
+ return result |
+ |
+ |
def GlobToRegex(glob_pattern, ignore_case=False): |
"""Translate glob wildcards (*?) into regex syntax. Escape the rest.""" |
regex = '' |