expect_tests: add options to enable per-module runs.

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 logging
 import multiprocessing
 import os
 import sys
 
@@ skipping 42 matching lines @@
 
       sp.add_argument(
           '--force-coverage', '--force_coverage', action='store_true',
           help='Enable coverage report even when specifying a test filter.')
 
     sp.add_argument(
         '--no-coverage', '--no_coverage', action='store_true',
         help='Disable coverage report.')
 
     sp.add_argument(
+        '--coveragerc', metavar='FILE',
+        help='File to read coverage configuration. Default: .coveragerc')
+
+    sp.add_argument(
         '--test-list', '--test_list', metavar='FILE',
         help='take the list of test globs from the FILE (use "-" for stdin)'
     ).completer = lambda **_: []
 
     sp.add_argument(
         '--html-report', '--html_report', metavar='DIR',
         help='directory to write html report (default: disabled)'
     ).completer = lambda **_: []
 
     sp.add_argument(
+        '--html-report-subdir', '--html_report_subdir', metavar='DIR',
+        help=('additional relative path within --html-report to write html '
+              'report (default: empty)'))
+
+    sp.add_argument(
         '--leak-temp', '--leak_temp', action='store_true',
         help='leak temporary directory for debugging (default: False)'
     )
 
     sp.add_argument(
         'test_glob', nargs='*', help=(
             'paths to look for tests in. It can be a directory containing '
             'packages, a package, a file inside a package or a test inside a '
             'file (append the name of the test to the path using a colon)')
     )
@@ skipping 62 matching lines @@
     orig_parse_args = argparse.ArgumentParser.parse_args
     def new_parse_args(self, *args, **kwargs):
       argcomplete.autocomplete(self)
       return orig_parse_args(*args, **kwargs)
     argparse.ArgumentParser.parse_args = new_parse_args
 
   try:
     opts = _parse_args(args)
     skip_loop = opts.handler.SKIP_RUNLOOP
 
-    cover_ctx = CoverageContext(cover_branches, opts.html_report,
-                                not skip_loop)
+    html_report = opts.html_report
+    if html_report and opts.html_report_subdir:
+      html_report = os.path.join(html_report, opts.html_report_subdir)
+
+    cover_ctx = CoverageContext(cover_branches, html_report,
+                                enabled=not skip_loop,
+                                coveragerc=opts.coveragerc)
 
     # This is a quick hack to disable rude modules from implicitly configuring
     # basic logging at import-time.
     map(logging.getLogger().removeHandler, logging.getLogger().handlers)
 
     with TempDir(opts.leak_temp):
       error, killed = result_loop(cover_ctx.create_subprocess_context(), opts)
 
     cover_ctx.cleanup()
     if (not killed and
         (not opts.test_glob or
         opts.coverage)):
       if not cover_ctx.report(opts.verbose):
         sys.exit(2)
 
     sys.exit(error or killed)
   except KeyboardInterrupt:
     pass
 
 
 # This script is invoked from scripts/expect_tests.
 if __name__ == '__main__':
   main()