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

buildbot/master/skia_master_scripts/skia_build_step.py

 # Copyright (c) 2012 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.
 
 """ Skia-specific subclass of BuildStep """
 
 
 from buildbot.status.logfile import STDOUT
 from master.log_parser import retcode_command
 import re
@@ skipping 73 matching lines @@
   prop: string, the property to test
   """
   try:
     step.getProperty(prop)
     return True
   # pylint: disable=W0702
   except:
     return False
 
 
-def _CheckRebaselineChanges(changes, gm_image_subdir):

[epoger, 2013/08/13 18:16:53]

As far as I can tell, this function isn't called anymore.

-  """ Determine whether a set of changes consists of only files in 'gm-expected'
-  and whether any of those files are in the given gm_image_subdir. Returns a
-  tuple consisting of two booleans: whether or not the commit consists of only
-  new baseline images, and whether or not baselines changed for the given
-  platform.
-
-  changes: a list of the changelists which are part of this build.
-  gm_image_subdir: the subdirectory inside gm-expected which corresponds to this
-      build slave's platform.
-  """
-  commit_is_only_baselines = True
-  platform_changed = False
-  for change in changes:
-    for changed_file in change.asDict()['files']:
-      for subdir in utils.SKIA_PRIMARY_SUBDIRS:
-        if subdir != 'gm-expected' and subdir in changed_file['name']:
-          commit_is_only_baselines = False
-      if gm_image_subdir in changed_file:
-        platform_changed = True
-  return commit_is_only_baselines, platform_changed
-
-
 def ShouldDoStep(step):
   """ At build time, use build properties to determine whether or not a step
   should be run or skipped.
 
   step: an instance of BuildStep which we may or may not run.
   """
   print step.build.getProperties()
   if not isinstance(step, SkiaBuildStep):
     return True
 
   # If this step uploads results (and thus overwrites the most recently uploaded
   # results), only run it on scheduled builds (i.e. most recent revision) or if
   # the "force_upload" property was set.
   if step.IsUploadStep() and \
       not _HasProperty(step, 'scheduler') and \
       not _HasProperty(step, 'force_upload'):
     return False
 
   # Unless we have determined otherwise, run the step.
   return True