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

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 89 matching lines @@
     # and other directories we also wish to check out.
     self._gclient_solutions = [gclient_factory.GClientSolution(
         svn_url=SKIA_SVN_BASEURL + '/' + build_subdir, name=build_subdir
         ).GetSpec()]
 
     if not other_subdirs:
       other_subdirs = []
     subdirs_to_checkout = set(other_subdirs)
 
     # Trybots need to check out all of these directories.
-    if do_patch_step and not \
-        builder_name.startswith(builder_name_schema.BUILDER_ROLE_BUILD):
-      subdirs_to_checkout.add('gm-expected')
     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
 
@@ skipping 610 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