summaryrefslogtreecommitdiffstats
path: root/tools/valgrind/chrome_tests.py
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 12:46:34 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 12:46:34 +0000
commite28f36f30c0ae727cf5bb9172f9880a5325703a9 (patch)
tree354304ecbf23b4d6824cdf3dc9ed63e3d7c6f631 /tools/valgrind/chrome_tests.py
parentbcb1a598e54dd0ed53ef166913c9868dccffd7ce (diff)
downloadchromium_src-e28f36f30c0ae727cf5bb9172f9880a5325703a9.zip
chromium_src-e28f36f30c0ae727cf5bb9172f9880a5325703a9.tar.gz
chromium_src-e28f36f30c0ae727cf5bb9172f9880a5325703a9.tar.bz2
Add win32 gtest filter files shared between Wine and TSan/Windows
BUG=28363 Review URL: http://codereview.chromium.org/1377003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
-rwxr-xr-xtools/valgrind/chrome_tests.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index cd8f891..fb29b30 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -135,12 +135,12 @@ class ChromeTests:
if os.path.exists(suppression_file):
cmd.append("--suppressions=%s" % suppression_file)
# Platform specific suppression
- suppression_platform = common.PlatformName()
- suppression_file_platform = \
- os.path.join(directory,
- '%s/suppressions_%s.txt' % (tool_name, suppression_platform))
- if os.path.exists(suppression_file_platform):
- cmd.append("--suppressions=%s" % suppression_file_platform)
+ for suppression_platform in common.PlatformNames():
+ suppression_file_platform = \
+ os.path.join(directory,
+ '%s/suppressions_%s.txt' % (tool_name, suppression_platform))
+ if os.path.exists(suppression_file_platform):
+ cmd.append("--suppressions=%s" % suppression_file_platform)
cmd.append("--tool=%s" % self._options.valgrind_tool)
if self._options.valgrind_tool_flags:
@@ -171,11 +171,12 @@ class ChromeTests:
'''
filters = []
for directory in self._data_dirs:
- platform_suffix = common.PlatformName()
gtest_filter_files = [
os.path.join(directory, name + ".gtest.txt"),
os.path.join(directory, name + ".gtest-%s.txt" % \
- self._options.valgrind_tool),
+ self._options.valgrind_tool)]
+ for platform_suffix in common.PlatformNames():
+ gtest_filter_files += [
os.path.join(directory, name + ".gtest_%s.txt" % platform_suffix),
os.path.join(directory, name + ".gtest-%s_%s.txt" % \
(self._options.valgrind_tool, platform_suffix))]