Remove base-* directories from gm expected/actual paths; just use platform names

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
 # pylint: disable=W0611
 import flavor_utils
 import imp
@@ skipping 135 matching lines @@
           'flavor_utils.%s' % flavor_utils_module_name, flavor_utils_path)
       flavor_utils_class_name = ''.join([part.title() for part in
                                          flavor.split('_')])
       flavor_utils_class = getattr(flavor_utils_module,
                                    '%sBuildStepUtils' % flavor_utils_class_name)
       self._flavor_utils = flavor_utils_class(self)
     except (ImportError, IOError) as e:
       raise Exception('Unrecognized build flavor: %s\n%s' % (flavor, e))
 
     self._configuration = args['configuration']
-    self._gm_image_subdir = args['gm_image_subdir']
 
     self._target_platform = args['target_platform']
     self._deps_target_os = \
         None if args['deps_target_os'] == 'None' else args['deps_target_os']
     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('expectations', 'gm',
-                                         self._gm_image_subdir)
+                                         self._builder_name)
     self._gm_actual_dir = os.path.join(self._gm_actual_basedir,
-                                       self._gm_image_subdir)
+                                       self._builder_name)
     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('"', ''))
     self._gm_args = shlex.split(args['gm_args'].replace('"', ''))
     self._gm_args.append('--serialize')
     self._bench_args = shlex.split(args['bench_args'].replace('"', ''))
     self._is_try = args['is_try'] == 'True'
 
     if os.name == 'nt':
       self._default_make_flags = []
     else:
       # Set the jobs limit to 4, since we have multiple slaves running on each
       # machine.
       self._default_make_flags = ['--jobs', '4', '--max-load=4.0']
 
     # Adding the playback directory transfer objects.
     self._local_playback_dirs = LocalSkpPlaybackDirs(
-        self._builder_name, self._gm_image_subdir,
+        self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
     self._storage_playback_dirs = StorageSkpPlaybackDirs(
-        self._builder_name, self._gm_image_subdir,
+        self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
 
     self._skp_dir = self._local_playback_dirs.PlaybackSkpDir()
 
     # Figure out where we are going to store performance output.
     if args['perf_output_basedir'] != 'None':
       self._perf_data_dir = os.path.join(args['perf_output_basedir'],
                                          self._builder_name, 'data')
       self._perf_graphs_dir = os.path.join(args['perf_output_basedir'],
@@ skipping 168 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)