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 151 matching lines @@
         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('"', ''))
@@ skipping 194 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)