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

buildbot/master/skia_master_scripts/factory.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.
 
 
 """Utility class to build the Skia master BuildFactory's.
 
 Based on gclient_factory.py and adds Skia-specific steps."""
 
 
@@ skipping 32 matching lines @@
 _COMPILE_NO_WERR_PREFIX = 'Retry_NoWarningsAsErrors_' + _COMPILE_STEP_PREFIX
 
 
 class SkiaFactory(BuildFactory):
   """Encapsulates data and methods common to the Skia master.cfg files."""
 
   def __init__(self, other_subdirs=None, do_upload_results=False,
                do_patch_step=False, build_subdir='trunk',
                target_platform=None, configuration=CONFIG_DEBUG,
                default_timeout=8*60*60, deps_target_os=None,
-               environment_variables=None, gm_image_subdir=None,
+               environment_variables=None,
                perf_output_basedir=None, builder_name=None, flavor=None,
                make_flags=None, test_args=None, gm_args=None, bench_args=None,
                bench_pictures_cfg='default', compile_warnings_as_errors=False,
                gyp_defines=None, build_targets=None):
     """Instantiates a SkiaFactory as appropriate for this target_platform.
 
     do_upload_results: whether we should upload bench/gm results
     do_patch_step: whether the build should include a step which applies a
         patch.  This is only applicable for trybots.
     build_subdir: subdirectory to check out and then build within
     other_subdirs: list of other subdirectories to also check out (or None)
     target_platform: a string such as TARGET_PLATFORM_LINUX
     configuration: 'Debug' or 'Release'
     default_timeout: default timeout for each command, in seconds
     deps_target_os: string; the target_os to be specified in the gclient config.
     environment_variables: dictionary of environment variables that should
         be passed to all commands
-    gm_image_subdir: directory containing images for comparison against results
-        of gm tool
     perf_output_basedir: path to directory under which to store performance
         data, or None if we don't want to store performance data
     builder_name: name of the builder associated with this factory
     flavor: which "flavor" of slave-side scripts this factory should use
     make_flags: list of extra flags to pass to the compile step
     test_args: list of extra flags to pass to the 'tests' executable
     gm_args: list of extra flags to pass to the 'gm' executable
     bench_args: list of extra flags to pass to the 'bench' executable
     bench_pictures_cfg: config name to use for bench_pictures
     compile_warnings_as_errors: boolean; whether to build with "-Werror" or
@@ skipping 24 matching lines @@
     subdirs_to_checkout = set(other_subdirs)
 
     # Trybots need to check out all of these directories.
     for other_subdir in subdirs_to_checkout:
       self._gclient_solutions.append(gclient_factory.GClientSolution(
           svn_url=SKIA_SVN_BASEURL + '/' + other_subdir,
           name=other_subdir).GetSpec())
 
     self._deps_target_os = deps_target_os
 
-    if gm_image_subdir:
-      properties['gm_image_subdir'] = gm_image_subdir
-
     # Set _default_clobber based on config.Master
     self._default_clobber = getattr(config.Master, 'default_clobber', False)
 
     self._do_upload_results = do_upload_results
     self._do_upload_bench_results = do_upload_results and \
         perf_output_basedir != None
     self._do_patch_step = do_patch_step
 
     if not environment_variables:
       self._env_vars = {}
@@ skipping 48 matching lines @@
     if not gm_args:
       gm_args = []
     if not bench_args:
       bench_args = []
 
     self._common_args = [
         '--autogen_svn_baseurl', AUTOGEN_SVN_BASEURL,
         '--configuration', configuration,
         '--deps_target_os', self._deps_target_os or 'None',
         '--do_upload_results', str(self._do_upload_results),
-        '--gm_image_subdir', gm_image_subdir or 'None',
         '--builder_name', builder_name,
         '--target_platform', target_platform,
         '--revision', WithProperties('%(rev)s', rev=_DetermineRevision),
         '--got_revision', WithProperties('%(got_revision:-None)s'),
         '--perf_output_basedir', perf_output_basedir or 'None',
         '--make_flags', '"%s"' % ' '.join(self._make_flags),
         '--test_args', '"%s"' % ' '.join(test_args),
         '--gm_args', '"%s"' % ' '.join(gm_args),
         '--bench_args', '"%s"' % ' '.join(bench_args),
         '--num_cores', WithProperties('%(num_cores:-None)s'),
@@ skipping 294 matching lines @@
   def PreBench(self):
     """ Step to run before the benchmarking steps. """
     self.AddFlavoredSlaveScript(script='prebench.py', description='PreBench')
 
   def PostBench(self):
     """ Step to run after the benchmarking steps. """
     self.AddFlavoredSlaveScript(script='postbench.py', description='PostBench')
 
   def CompareGMs(self):
     """ Run the "skdiff" tool to compare the "actual" GM images we just
-    generated to the baselines in _gm_image_subdir. """
+    generated to the baselines for this builder_name. """
     self.AddSlaveScript(script='compare_gms.py', description='CompareGMs',
                         is_rebaseline_step=True)
   
   def CompareAndUploadWebpageGMs(self):
     """ Run the "skdiff" tool to compare the "actual" GM images we just
-    generated to the baselines in _gm_image_subdir and uploads the actual
+    generated to the baselines for this builder_name and uploads the actual
     images if appropriate. """
     self.AddSlaveScript(script='compare_and_upload_webpage_gms.py',
                         description='CompareAndUploadWebpageGMs',
                         is_rebaseline_step=True)
 
   def RunBench(self):
     """ Run "bench", piping the output somewhere so we can graph
     results over time. """
     self.AddFlavoredSlaveScript(script='run_bench.py', description='RunBench')
 
@@ skipping 185 matching lines @@
         # Perf-only builder.
         if not self._perf_output_basedir:
           raise ValueError(
               'BuildPerfOnly requires perf_output_basedir to be defined.')
         if self._configuration != CONFIG_RELEASE:
           raise ValueError('BuildPerfOnly should run in %s configuration.' %
                            CONFIG_RELEASE)
         self.PerfSteps()
     self.Validate()
     return self