More work to integrate skimage with rebaseline tools.

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 360 matching lines @@
                           'pertain to this set of rebaselines.'))
 parser.add_argument('--builders', metavar='BUILDER', nargs='+',
                     help=('which platforms to rebaseline; '
                           'if unspecified, rebaseline all known platforms '
                           '(see below for a list)'))
 # TODO(epoger): Add test that exercises --configs argument.
 parser.add_argument('--configs', metavar='CONFIG', nargs='+',
                     help=('which configurations to rebaseline, e.g. '
                           '"--configs 565 8888", as a filter over the full set '
                           'of results in ACTUALS_FILENAME; if unspecified, '
-                          'rebaseline *all* configs that are available. '
-                          'Ignored if SKIMAGE is True.'))
+                          'rebaseline *all* configs that are available.'))
 parser.add_argument('--expectations-filename',
                     help=('filename (under EXPECTATIONS_ROOT) to read '
                           'current expectations from, and to write new '
                           'expectations into (unless a separate '
                           'EXPECTATIONS_FILENAME_OUTPUT has been specified); '
                           'defaults to %(default)s'),
                     default='expected-results.json')
 parser.add_argument('--expectations-filename-output',
                     help=('filename (under EXPECTATIONS_ROOT) to write '
                           'updated expectations into; by default, overwrites '
@@ skipping 12 matching lines @@
                           'at the end'))
 parser.add_argument('--notes',
                     help=('free-form text notes to add to all updated '
                           'expectations'))
 # TODO(epoger): Add test that exercises --tests argument.
 parser.add_argument('--tests', metavar='TEST', nargs='+',
                     help=('which tests to rebaseline, e.g. '
                           '"--tests aaclip bigmatrix", as a filter over the '
                           'full set of results in ACTUALS_FILENAME; if '
                           'unspecified, rebaseline *all* tests that are '
-                          'available. Ignored if SKIMAGE is True.'))
+                          'available.'))
 parser.add_argument('--unreviewed', action='store_true',
                     help=('mark all expectations modified by this run as '
                           '"%s": False' %
                           gm_json.JSONKEY_EXPECTEDRESULTS_REVIEWED))
 parser.add_argument('--ignore-failure', action='store_true',
                     help=('mark all expectations modified by this run as '
                           '"%s": True' %
                           gm_json.JSONKEY_ACTUALRESULTS_FAILUREIGNORED))
 parser.add_argument('--from-trybot', action='store_true',
                     help=('pull the actual-results.json file from the '
@@ skipping 11 matching lines @@
   missing_json_is_fatal = True
 else:
   builders = sorted(TEST_BUILDERS)
   missing_json_is_fatal = False
 if args.skimage:
   # Use a different default if --skimage is specified.
   if args.actuals_base_url == parser.get_default('actuals_base_url'):
     args.actuals_base_url = gm_json.SKIMAGE_ACTUALS_BASE_URL
   if args.expectations_root == parser.get_default('expectations_root'):
     args.expectations_root = gm_json.SKIMAGE_EXPECTATIONS_ROOT
-  # Also ignore TESTS and CONFIGS
-  args.tests = None
-  args.configs = None
 for builder in builders:
   if not builder in TEST_BUILDERS:
     raise Exception(('unrecognized builder "%s"; ' +
                      'should be one of %s') % (
                          builder, TEST_BUILDERS))
 
   expectations_json_file = os.path.join(args.expectations_root, builder,
                                         args.expectations_filename)
   if os.path.isfile(expectations_json_file):
     rebaseliner = JsonRebaseliner(
@@ skipping 14 matching lines @@
     except:
       exception_handler.RaiseExceptionOrContinue()
   else:
     try:
       raise _InternalException('expectations_json_file %s not found' %
                                expectations_json_file)
     except:
       exception_handler.RaiseExceptionOrContinue()
 
 exception_handler.ReportAllFailures()