Add win32 gtest filter files shared between Wine and TSan/Windows

tools/valgrind/chrome_tests.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 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.
 
 # chrome_tests.py
 
 ''' Runs various chrome tests through valgrind_test.py.'''
 
 import glob
@@ skipping 117 matching lines @@
           self._options.build_dir = FindNewestDir(dirs)
 
     cmd = list(self._command_preamble)
     for directory in self._data_dirs:
       tool_name = self._options.valgrind_tool
       suppression_file = os.path.join(directory,
           "%s/suppressions.txt" % tool_name)
       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:
       cmd += self._options.valgrind_tool_flags.split(" ")
     if valgrind_test_args != None:
       for arg in valgrind_test_args:
         cmd.append(arg)
     if exe:
       if common.IsWine():
         cmd.append(os.environ.get('WINE'))
@@ skipping 10 matching lines @@
     ''' Runs the test specified by command-line argument --test '''
     logging.info("running test %s" % (self._test))
     return self._test_list[self._test]()
 
   def _ReadGtestFilterFile(self, name, cmd):
     '''Read a file which is a list of tests to filter out with --gtest_filter
     and append the command-line option to cmd.
     '''
     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))]
       for filename in gtest_filter_files:
         if os.path.exists(filename):
           logging.info("reading gtest filters from %s" % filename)
           f = open(filename, 'r')
           for line in f.readlines():
             if line.startswith("#") or line.startswith("//") or line.isspace():
               continue
@@ skipping 223 matching lines @@
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret: return ret
   return 0
 
 
 if __name__ == "__main__":
   ret = _main(sys.argv)
   sys.exit(ret)