Slightly tweak the tools/heapcheck/chrome_tests.py script to read less gtest filter files

tools/heapcheck/chrome_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 ''' Runs various chrome tests through heapcheck_test.py.
 
 Most of this code is copied from ../valgrind/chrome_tests.py.
 TODO(glider): put common functions to a standalone module.
@@ skipping 116 matching lines @@
     '''Generates the default command array that most tests will use.
 
     Args:
       module: The module name (corresponds to the dir in src/ where the test
               data resides).
       exe: The executable name.
       heapcheck_test_args: additional arguments to append to the command line.
     Returns:
       A string with the command to run the test.
     '''
-    module_dir = os.path.join(self._source_dir, module)
-
-    # We need multiple data dirs, the current script directory and a module
-    # specific one. The global suppression file lives in our directory, and the
-    # module specific suppression file lives with the module.
-    self._data_dirs = [path_utils.ScriptDir()]
-
-    if module == "chrome":
-      # Unfortunately, not all modules have the same directory structure.
-      self._data_dirs.append(os.path.join(module_dir, "test", "data",
-                                          "heapcheck"))
-    else:
-      self._data_dirs.append(os.path.join(module_dir, "data", "heapcheck"))
-
     if not self._options.build_dir:
       dirs = [
         os.path.join(self._source_dir, "xcodebuild", "Debug"),
         os.path.join(self._source_dir, "out", "Debug"),
       ]
       if exe:
         self._options.build_dir = FindDirContainingNewestFile(dirs, exe)
       else:
         self._options.build_dir = FindNewestDir(dirs)
 
     cmd = list(self._command_preamble)
 
     if heapcheck_test_args != None:
       for arg in heapcheck_test_args:
         cmd.append(arg)
     if exe:
       cmd.append(os.path.join(self._options.build_dir, exe))
       # Heapcheck runs tests slowly, so slow tests hurt more; show elapased time
       # so we can find the slowpokes.
       cmd.append("--gtest_print_time")
     if self._options.gtest_repeat:
       cmd.append("--gtest_repeat=%s" % self._options.gtest_repeat)
     return cmd
 
   def Suppressions(self):
     '''Builds the list of available suppressions files.'''
     ret = []
-    for directory in self._data_dirs:
-      suppression_file = os.path.join(directory, "suppressions.txt")
-      if os.path.exists(suppression_file):
-        ret.append(suppression_file)
-      suppression_file = os.path.join(directory, "suppressions_linux.txt")
-      if os.path.exists(suppression_file):
-        ret.append(suppression_file)
+    directory = path_utils.ScriptDir()
+    suppression_file = os.path.join(directory, "suppressions.txt")
+    if os.path.exists(suppression_file):
+      ret.append(suppression_file)
+    suppression_file = os.path.join(directory, "suppressions_linux.txt")
+    if os.path.exists(suppression_file):
+      ret.append(suppression_file)
     return ret
 
   def Run(self):
     '''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):
     '''Reads files which contain lists of tests to filter out with
     --gtest_filter and appends the command-line option to |cmd|.
 
     Args:
       name: the test executable name.
       cmd: the test running command line to be modified.
     '''
     filters = []
-    for directory in self._data_dirs:
-      gtest_filter_files = [
-          os.path.join(directory, name + ".gtest.txt"),

[Timur Iskhodzhanov, 2011/08/16 09:46:05]

we don't use this

-          os.path.join(directory, name + ".gtest-heapcheck.txt"),
-          os.path.join(directory, name + ".gtest_linux.txt")]

[Timur Iskhodzhanov, 2011/08/16 09:46:05]

we don't use this yet

-      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
-            line = line.rstrip()
-            filters.append(line)
+    directory = path_utils.ScriptDir()
+    gtest_filter_files = [
+        os.path.join(directory, name + ".gtest-heapcheck.txt"),
+        # TODO(glider): Linux vs. CrOS?
+    ]
+    logging.info("Reading gtest exclude filter files:")
+    for filename in gtest_filter_files:
+      # strip the leading absolute path (may be very long on the bot)
+      # and the following / or \.
+      readable_filename = filename.replace(self._source_dir, "")[1:]
+      if not os.path.exists(filename):
+        logging.info("  \"%s\" - not found" % readable_filename)
+        continue
+      logging.info("  \"%s\" - OK" % readable_filename)
+      f = open(filename, 'r')
+      for line in f.readlines():
+        if line.startswith("#") or line.startswith("//") or line.isspace():
+          continue
+        line = line.rstrip()
+        filters.append(line)
     gtest_filter = self._options.gtest_filter
     if len(filters):
       if gtest_filter:
         gtest_filter += ":"
         if gtest_filter.find("-") < 0:
           gtest_filter += "-"
       else:
         gtest_filter = "-"
       gtest_filter += ":".join(filters)
     if gtest_filter:
@@ skipping 235 matching lines @@
   return 0
 
 
 if __name__ == "__main__":
   if sys.platform.startswith('linux'):
     ret = _main(sys.argv)
   else:
     logging.error("Heap checking works only on Linux at the moment.")
     ret = 1
   sys.exit(ret)