Add new try job test filter specification format to chrome_tests.sh

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
 import logging
 import optparse
 import os
 import stat
 import sys
 
 import logging_utils
 import path_utils
 
 import common
 import valgrind_test
 
 class TestNotFound(Exception): pass
 
+class MultipleGTestFiltersSpecified(Exception): pass
+
 def Dir2IsNewer(dir1, dir2):
   if dir2 == None or not os.path.isdir(dir2):
     return False
   if dir1 == None or not os.path.isdir(dir1):
     return True
   return (os.stat(dir2)[stat.ST_MTIME] - os.stat(dir1)[stat.ST_MTIME]) > 0
 
 def FindNewestDir(dirs):
   newest_dir = None
   for dir in dirs:
@@ skipping 16 matching lines @@
     if File2IsNewer(newest_file, the_file):
       newest_dir = dir
       newest_file = the_file
   if newest_dir == None:
     logging.error("cannot find file %s anywhere, have you built it?" % file)
     sys.exit(-1)
   return newest_dir
 
 class ChromeTests:
   def __init__(self, options, args, test):
-    # The known list of tests.
-    # Recognise the original abbreviations as well as full executable names.
-    self._test_list = {
-      "base": self.TestBase,            "base_unittests": self.TestBase,
-      "browser": self.TestBrowser,      "browser_tests": self.TestBrowser,
-      "googleurl": self.TestGURL,       "googleurl_unittests": self.TestGURL,
-      "ipc": self.TestIpc,              "ipc_tests": self.TestIpc,
-      "layout": self.TestLayout,        "layout_tests": self.TestLayout,
-      "media": self.TestMedia,          "media_unittests": self.TestMedia,
-      "net": self.TestNet,              "net_unittests": self.TestNet,
-      "printing": self.TestPrinting,    "printing_unittests": self.TestPrinting,
-      "startup": self.TestStartup,      "startup_tests": self.TestStartup,
-      "sync": self.TestSync,            "sync_unit_tests": self.TestSync,
-      "test_shell": self.TestTestShell, "test_shell_tests": self.TestTestShell,
-      "ui": self.TestUI,                "ui_tests": self.TestUI,
-      "unit": self.TestUnit,            "unit_tests": self.TestUnit,
-      "app": self.TestApp,              "app_unittests": self.TestApp,
-    }
+    if ':' in test:
+      (self._test, self._gtest_filter) = test.split(':', 1)
+    else:
+      self._test = test
+      self._gtest_filter = options.gtest_filter
 
-    if test not in self._test_list:
+    if self._test not in self._test_list:
       raise TestNotFound("Unknown test: %s" % test)
 
+    if options.gtest_filter and options.gtest_filter != self._gtest_filter:
+      raise MultipleGTestFiltersSpecified("Can not specify both --gtest_filter "
+                                          "and --test %s" % test)
+
     self._options = options
     self._args = args
-    self._test = test
 
     script_dir = path_utils.ScriptDir()
     # Compute the top of the tree (the "source dir") from the script dir (where
     # this script lives).  We assume that the script dir is in tools/valgrind/
     # relative to the top of the tree.
     self._source_dir = os.path.dirname(os.path.dirname(script_dir))
     # since this path is used for string matching, make sure it's always
     # an absolute Unix-style path
     self._source_dir = os.path.abspath(self._source_dir).replace('\\', '/')
     valgrind_test_script = os.path.join(script_dir, "valgrind_test.py")
@@ skipping 60 matching lines @@
       # Valgrind 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 Run(self):
     ''' Runs the test specified by command-line argument --test '''
     logging.info("running test %s" % (self._test))
-    return self._test_list[self._test]()
+    return self._test_list[self._test](self)
 
   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:
       gtest_filter_files = [
           os.path.join(directory, name + ".gtest.txt"),
           os.path.join(directory, name + ".gtest-%s.txt" % \
               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
             line = line.rstrip()
             filters.append(line)
-    gtest_filter = self._options.gtest_filter
+    gtest_filter = self._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:
       cmd.append("--gtest_filter=%s" % gtest_filter)
@@ skipping 164 matching lines @@
       f.write("%d" % chunk_num)
       f.close()
     except IOError, (errno, strerror):
       logging.error("error writing to file %s (%d, %s)" % (chunk_file, errno,
                     strerror))
     # Since we're running small chunks of the layout tests, it's important to
     # mark the ones that have errors in them.  These won't be visible in the
     # summary list for long, but will be useful for someone reviewing this bot.
     return ret
 
+  # The known list of tests.
+  # Recognise the original abbreviations as well as full executable names.
+  _test_list = {
+    "base": TestBase,            "base_unittests": TestBase,
+    "browser": TestBrowser,      "browser_tests": TestBrowser,
+    "googleurl": TestGURL,       "googleurl_unittests": TestGURL,
+    "ipc": TestIpc,              "ipc_tests": TestIpc,
+    "layout": TestLayout,        "layout_tests": TestLayout,
+    "media": TestMedia,          "media_unittests": TestMedia,
+    "net": TestNet,              "net_unittests": TestNet,
+    "printing": TestPrinting,    "printing_unittests": TestPrinting,
+    "startup": TestStartup,      "startup_tests": TestStartup,
+    "sync": TestSync,            "sync_unit_tests": TestSync,
+    "test_shell": TestTestShell, "test_shell_tests": TestTestShell,
+    "ui": TestUI,                "ui_tests": TestUI,
+    "unit": TestUnit,            "unit_tests": TestUnit,
+    "app": TestApp,              "app_unittests": TestApp,
+  }
+
 def _main(_):
   parser = optparse.OptionParser("usage: %prog -b <dir> -t <test> "
                                  "[-t <test> ...]")
   parser.disable_interspersed_args()
   parser.add_option("-b", "--build_dir",
                     help="the location of the output of the compiler output")
-  parser.add_option("-t", "--test", action="append",
-                    help="which test to run")
+  parser.add_option("-t", "--test", action="append", default=[],
+                    help="which test to run, supports test:gtest_filter format "
+                         "as well.")
   parser.add_option("", "--baseline", action="store_true", default=False,
                     help="generate baseline data instead of validating")
   parser.add_option("", "--gtest_filter",
                     help="additional arguments to --gtest_filter")
   parser.add_option("", "--gtest_repeat",
                     help="argument for --gtest_repeat")
   parser.add_option("-v", "--verbose", action="store_true", default=False,
                     help="verbose output - enable debug log messages")
   parser.add_option("", "--tool", dest="valgrind_tool", default="memcheck",
                     help="specify a valgrind tool to run the tests under")
   parser.add_option("", "--tool_flags", dest="valgrind_tool_flags", default="",
                     help="specify custom flags for the selected valgrind tool")
   # My machine can do about 120 layout tests/hour in release mode.
   # Let's do 30 minutes worth per run.
   # The CPU is mostly idle, so perhaps we can raise this when
   # we figure out how to run them more efficiently.
   parser.add_option("-n", "--num_tests", default=60, type="int",
                     help="for layout tests: # of subtests per run.  0 for all.")
 
   options, args = parser.parse_args()
 
   if options.verbose:
     logging_utils.config_root(logging.DEBUG)
   else:
     logging_utils.config_root()
 
-  if not options.test or not len(options.test):
+  if not options.test:
     parser.error("--test not specified")
 
+  if len(options.test) != 1 and options.gtest_filter:
+    parser.error("--gtest_filter and multiple tests don't make sense together")
+
   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)