Set coverage path globs on a per-Test basis instead of in main().

scripts/slave/unittests/expect_tests/main.py

 # Copyright 2014 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.
 
 import argparse
 import multiprocessing
-import os
 import sys
 
 from .cover import CoverageContext
 
 from . import handle_list, handle_debug, handle_train, handle_test
 
 from .pipeline import result_loop
 
 
 HANDLERS = {
@@ skipping 70 matching lines @@
         '--test_list', metavar='FILE',
         help='take the list of test globs from the FILE (use "-" for stdin)'
     ).completer = lambda **_: []
 
     sp.add_argument(
         '--html_report', metavar='DIR',
         help='directory to write html report (default: disabled)'
     ).completer = lambda **_: []
 
     sp.add_argument(
-        '--extra_coverage_data', metavar='FILE', nargs='*',
-        help='additional coverage data files to incorporate'
-    ).completer = lambda **_: []
-
-    sp.add_argument(
         'test_glob', nargs='*', help=(
             'glob to filter the tests acted on. If the glob begins with "-" '
             'then it acts as a negation glob and anything which matches it '
             'will be skipped. If a glob doesn\'t have "*" in it, "*" will be '
             'implicitly appended to the end')
     ).completer = _test_completer(test_gen)
 
   opts = parser.parse_args(args)
 
   if not hasattr(opts, 'jobs'):
     opts.jobs = 0
   elif opts.jobs < 1:
     parser.error('--jobs was less than 1')
 
-  if opts.extra_coverage_data:
-    for fname in opts.extra_coverage_data:
-      if not os.path.exists(fname):
-        parser.error('--extra_coverage_data %r does not exist' % fname)
-
   if opts.test_list:
     fh = sys.stdin if opts.test_list == '-' else open(opts.test_list, 'rb')
     with fh as tl:
       opts.test_glob += [l.strip() for l in tl.readlines()]
 
   opts.handler = HANDLERS[opts.mode]
 
   del opts.test_list
   del opts.mode
 
   return opts
 
 
-def main(name, test_gen, coverage_includes=None, coverage_omits=None,
-         cover_branches=False, args=None):
+def main(name, test_gen, cover_branches=False, args=None):
   """Entry point for tests using expect_tests.
 
   Example:
     import expect_tests
 
     def happy_fn(val):
       # Usually you would return data which is the result of some deterministic
       # computation.
       return expect_tests.Result({'neet': '%s string value' % val})
 
     def Gen():
       yield expect_tests.Test('happy', happy_fn, args=('happy',))
 
     if __name__ == '__main__':
       expect_tests.main('happy_test_suite', Gen)
 
   @param name: Name of the test suite.
   @param test_gen: A Generator which yields Test objects.
-  @param coverage_includes: A list of path globs to include under coverage.
-  @param coverage_omits: A list of path globs to exclude under coverage.
   @param cover_branches: Include branch coverage data (rather than just line
                          coverage)
   @param args: Commandline args (starting at argv[1])
   """
   try:
     opts = _parse_args(args, test_gen)
 
-    cover_ctx = CoverageContext(name, coverage_includes, coverage_omits,
-                                cover_branches, opts.html_report,
-                                opts.extra_coverage_data,
+    cover_ctx = CoverageContext(name, cover_branches, opts.html_report,
                                 not opts.handler.SKIP_RUNLOOP)
 
-    error, killed = result_loop(test_gen, cover_ctx.create_subprocess_context(),
-                                opts)
+    error, killed = result_loop(
+        test_gen, cover_ctx.create_subprocess_context(), opts)
 
     cover_ctx.cleanup()
     if not killed and not opts.test_glob:
       if not cover_ctx.report(opts.verbose):
         sys.exit(2)
 
     sys.exit(error or killed)
   except KeyboardInterrupt:
     pass