Move gm-expected to trunk/expectations/gm , and modify scripts that use it.

trunk/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.
 '''
 
 '''
 Rebaselines the given GM tests, on all bots and all configurations.
-Must be run from the gm-expected directory.  If run from a git or SVN
-checkout, the files will be added to the staging area for commit.
 
 TODO(epoger): Fix indentation in this file (2-space indents, not 4-space).
 '''
 
 # System-level imports
 import argparse
 import os
 import re
 import sys
 import urllib2
@@ skipping 11 matching lines @@
 #
 # This assumes that the 'gm' directory has been checked out as a sibling of
 # the 'tools' directory containing this script, which will be the case if
 # 'trunk' was checked out as a single unit.
 GM_DIRECTORY = os.path.realpath(
     os.path.join(os.path.dirname(os.path.dirname(__file__)), 'gm'))
 if GM_DIRECTORY not in sys.path:
     sys.path.append(GM_DIRECTORY)
 import gm_json
 
-# Mapping of gm-expectations subdir (under
-# https://skia.googlecode.com/svn/gm-expected/ )
+# Mapping of expectations/gm subdir (under
+# https://skia.googlecode.com/svn/trunk/expectations/gm/ )
 # to builder name (see list at http://108.170.217.252:10117/builders )
 SUBDIR_MAPPING = {
    'base-shuttle-win7-intel-float':
     'Test-Win7-ShuttleA-HD2000-x86-Release',
    'base-shuttle-win7-intel-angle':
     'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE',
    'base-shuttle-win7-intel-directwrite':
     'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
    'base-shuttle_ubuntu12_ati5770':
     'Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release',
@@ skipping 141 matching lines @@
         actual_results = json_dict[gm_json.JSONKEY_ACTUALRESULTS]
         if not sections:
             sections = actual_results.keys()
         for section in sections:
             section_results = actual_results[section]
             if section_results:
                 results_to_return.update(section_results)
         return results_to_return
 
     # Rebaseline all tests/types we specified in the constructor,
-    # within this gm-expectations subdir.
+    # within this expectations/gm subdir.
     #
     # params:
     #  subdir : e.g. 'base-shuttle-win7-intel-float'
     #  builder : e.g. 'Test-Win7-ShuttleA-HD2000-x86-Release'
     def RebaselineSubdir(self, subdir, builder):
         # Read in the actual result summary, and extract all the tests whose
         # results we need to update.
         actuals_url = '/'.join([self._actuals_base_url,
                                 subdir, builder, subdir,
                                 self._actuals_filename])
@@ skipping 70 matching lines @@
                     '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='.')
+                    default=os.path.join('expectations', 'gm'))
 parser.add_argument('--keep-going-on-failure', action='store_true',
                     help='instead of halting at the first error encountered, ' +
                     'keep going and rebaseline as many tests as possible, ' +
                     'and then report the full set of errors at the end')
 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.
 parser.add_argument('--tests', metavar='TEST', nargs='+',
@@ skipping 12 matching lines @@
     missing_json_is_fatal = False
 for subdir in subdirs:
     if not subdir in SUBDIR_MAPPING.keys():
         raise Exception(('unrecognized platform subdir "%s"; ' +
                          'should be one of %s') % (
                              subdir, SUBDIR_MAPPING.keys()))
     builder = SUBDIR_MAPPING[subdir]
 
     # We instantiate different Rebaseliner objects depending
     # on whether we are rebaselining an expected-results.json file, or
-    # individual image files.  Different gm-expected subdirectories may move
+    # individual image files.  Different expectations/gm subdirectories may move
     # from individual image files to JSON-format expectations at different
     # times, so we need to make this determination per subdirectory.
     #
     # See https://goto.google.com/ChecksumTransitionDetail
     expectations_json_file = os.path.join(args.expectations_root, subdir,
                                           args.expectations_filename)
     if os.path.isfile(expectations_json_file):
         rebaseliner = JsonRebaseliner(
             expectations_root=args.expectations_root,
             expectations_filename=args.expectations_filename,
@@ skipping 18 matching lines @@
             exception_handler=exception_handler,
             add_new=args.add_new,
             missing_json_is_fatal=missing_json_is_fatal)
 
     try:
         rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)
     except BaseException as e:
         exception_handler.RaiseExceptionOrContinue(e)
 
 exception_handler.ReportAllFailures()