rebaseline.py: use specified configs/tests as a FILTER over actually-run tests

tools/rebaseline.py

 #!/usr/bin/python
 
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
@@ skipping 69 matching lines @@
     # params:
     #  expectations_root: root directory of all expectations JSON files
     #  expectations_filename: filename (under expectations_root) of JSON
     #                         expectations file; typically
     #                         "expected-results.json"
     #  actuals_base_url: base URL from which to read actual-result JSON files
     #  actuals_filename: filename (under actuals_base_url) from which to read a
     #                    summary of results; typically "actual-results.json"
     #  tests: list of tests to rebaseline, or None if we should rebaseline
     #         whatever files the JSON results summary file tells us to
-    #  configs: which configs to run for each test; this should only be
-    #           specified if the list of tests was also specified (otherwise,
-    #           the JSON file will give us test names and configs)
+    #  configs: which configs to run for each test, or None if we should
+    #           rebaseline whatever configs the JSON results summary file tells
+    #           us to
     #  add_new: if True, add expectations for tests which don't have any yet
     def __init__(self, expectations_root, expectations_filename,
                  actuals_base_url, actuals_filename,
                  tests=None, configs=None, add_new=False):
-        if configs and not tests:
-            raise ValueError('configs should only be specified if tests ' +
-                             'were specified also')
         self._expectations_root = expectations_root
         self._expectations_filename = expectations_filename
         self._tests = tests
         self._configs = configs
         self._actuals_base_url = actuals_base_url
         self._actuals_filename = actuals_filename
         self._add_new = add_new
         self._testname_pattern = re.compile('(\S+)_(\S+).png')
 
     # Returns the full contents of filepath, as a single string.
@@ skipping 98 matching lines @@
                     'of ACTUALS_BASE_URL) to read a summary of results from; ' +
                     'defaults to %(default)s',
                     default='actual-results.json')
 # TODO(epoger): Add test that exercises --add-new argument.
 parser.add_argument('--add-new', action='store_true',
                     help='in addition to the standard behavior of ' +
                     'updating expectations for failing tests, add ' +
                     'expectations for tests which don\'t have expectations ' +
                     'yet.')
 # TODO(epoger): Add test that exercises --configs argument.
-# TODO(epoger): Once we are only rebaselining JSON files, update the helpstring
-# to indicate that this is a *filter* over the config names that
-# actual-results.json tells us need to be rebaselined.
-# You don't need to specify tests also, etc.
 parser.add_argument('--configs', metavar='CONFIG', nargs='+',
                     help='which configurations to rebaseline, e.g. ' +
-                    '"--configs 565 8888"; if unspecified, run a default ' +
-                    'set of configs. This should ONLY be specified if ' +
-                    '--tests has also been specified.')
+                    '"--configs 565 8888", as a filter over the full set of ' +
+                    'results in ACTUALS_FILENAME; if unspecified, rebaseline ' +
+                    '*all* configs that are available.')
 # TODO(epoger): The --dry-run argument will no longer be needed once we
 # are only rebaselining JSON files.
 parser.add_argument('--dry-run', action='store_true',
                     help='instead of actually downloading files or adding ' +
                     'files to checkout, display a list of operations that ' +
                     'we would normally perform')
 parser.add_argument('--expectations-filename',
                     help='filename (under EXPECTATIONS_ROOT) to read ' +
                     'current expectations from, and to write new ' +
                     'expectations into; defaults to %(default)s',
                     default='expected-results.json')
 parser.add_argument('--expectations-root',
                     help='root of expectations directory to update-- should ' +
                     'contain one or more base-* subdirectories. Defaults to ' +
                     '%(default)s',
                     default='.')
 parser.add_argument('--subdirs', metavar='SUBDIR', nargs='+',
                     help='which platform subdirectories to rebaseline; ' +
                     'if unspecified, rebaseline all subdirs, same as ' +
                     '"--subdirs %s"' % ' '.join(sorted(SUBDIR_MAPPING.keys())))
 # TODO(epoger): Add test that exercises --tests argument.
-# TODO(epoger): Once we are only rebaselining JSON files, update the helpstring
-# to indicate that this is a *filter* over the test names that
-# actual-results.json tells us need to be rebaselined.
 parser.add_argument('--tests', metavar='TEST', nargs='+',
                     help='which tests to rebaseline, e.g. ' +
-                    '"--tests aaclip bigmatrix"; if unspecified, then all ' +
-                    'failing tests (according to the actual-results.json ' +
-                    'file) will be rebaselined.')
+                    '"--tests aaclip bigmatrix", as a filter over the full ' +
+                    'set of results in ACTUALS_FILENAME; if unspecified, ' +
+                    'rebaseline *all* tests that are available.')
 args = parser.parse_args()
 if args.subdirs:
     subdirs = args.subdirs
     missing_json_is_fatal = True
 else:
     subdirs = sorted(SUBDIR_MAPPING.keys())
     missing_json_is_fatal = False
 for subdir in subdirs:
     if not subdir in SUBDIR_MAPPING.keys():
         raise Exception(('unrecognized platform subdir "%s"; ' +
@@ skipping 21 matching lines @@
     else:
         rebaseliner = rebaseline_imagefiles.ImageRebaseliner(
             expectations_root=args.expectations_root,
             tests=args.tests, configs=args.configs,
             dry_run=args.dry_run,
             json_base_url=args.actuals_base_url,
             json_filename=args.actuals_filename,
             add_new=args.add_new,
             missing_json_is_fatal=missing_json_is_fatal)
     rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)