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

buildbot/slave/skia_slave_scripts/build_step.py

 # Copyright (c) 2013 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.
 
 """Base class for all slave-side build steps. """
 
 import config
 import errno
 import multiprocessing
 import os
@@ skipping 266 matching lines @@
     self._revision = \
         None if args['revision'] == 'None' or args['revision'] == 'HEAD' \
         else int(args['revision'])
     self._got_revision = \
         None if args['got_revision'] == 'None' else int(args['got_revision'])
     self._do_upload_results = (False if args['do_upload_results'] == 'None'
                                else args['do_upload_results'] == 'True')
     # Figure out where we are going to store images generated by GM.
     self._gm_actual_basedir = os.path.join(os.pardir, os.pardir, 'gm', 'actual')
     self._gm_merge_basedir = os.path.join(os.pardir, os.pardir, 'gm', 'merge')
-    self._gm_expected_dir = os.path.join(os.pardir, 'gm-expected',
+    self._gm_expected_dir = os.path.join('expectations', 'gm',
                                          self._gm_image_subdir)
     self._gm_actual_dir = os.path.join(self._gm_actual_basedir,
                                        self._gm_image_subdir)
     self._gm_actual_svn_baseurl = '%s/%s' % (args['autogen_svn_baseurl'],
                                              'gm-actual')
     self._resource_dir = 'resources'
     self._autogen_svn_username_file = '.autogen_svn_username'
     self._autogen_svn_password_file = '.autogen_svn_password'
     self._make_flags = shlex.split(args['make_flags'].replace('"', ''))
     self._test_args = shlex.split(args['test_args'].replace('"', ''))
@@ skipping 35 matching lines @@
 
     self._skimage_expected_dir = os.path.join('expectations', 'skimage')
 
     self._skimage_out_dir = os.path.join('out', self._configuration,
                                          'skimage_out')
 
     # Note that DeviceDirs.GMExpectedDir() is being set up to point at a
     # DIFFERENT directory than self._gm_expected.
     # self._gm_expected : The SVN-managed directory on the buildbot host
     #                     where canonical expectations are stored.
-    #                     Currently, they are stored there as
-    #                     individual image files.
     # DeviceDirs.GMExpectedDir(): A temporary directory on the device we are
     #                             testing, where the PreRender step will put
     #                             an expected-results.json file that describes
     #                             all GM results expectations.
     # TODO(epoger): Update the above description as we move through the steps in
     # https://goto.google.com/ChecksumTransitionDetail
     self._device_dirs = DeviceDirs(
         perf_data_dir=self._perf_data_dir,
         gm_actual_dir=os.path.join(os.pardir, os.pardir, 'gm', 'actual'),
         gm_expected_dir=os.path.join(os.pardir, os.pardir, 'gm', 'expected'),
@@ skipping 129 matching lines @@
         else:
           raise BuildStepFailure('Build step failed.')
       except Exception:
         print traceback.format_exc()
         if attempt + 1 >= step.attempts:
           raise
       # pylint: disable=W0212
       step._WaitFunc(attempt)
       attempt += 1
       print '**** %s, attempt %d ****' % (StepType.__name__, attempt + 1)