Added support for properly building and running isolates in recipes.

scripts/slave/recipe_modules/gpu/api.py

 # Copyright 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.
 
 from slave import recipe_api
 
 SIMPLE_TESTS_TO_RUN = [
   'content_gl_tests',
   'gles2_conform_test',
-  'gl_tests',
   'angle_unittests'
 ]
 
 class GpuApi(recipe_api.RecipeApi):
   def setup(self):
     """Call this once before any of the other APIs in this module."""
 
     # These values may be replaced by external configuration later
     self._dashboard_upload_url = 'https://chromeperf.appspot.com'
     self._gs_bucket_name = 'chromium-gpu-archive'
@@ skipping 32 matching lines @@
     self.m.chromium.c.gyp_env.GYP_DEFINES['disable_glibcxx_debug'] = 1
 
     # Don't skip the frame_rate data, as it's needed for the frame rate tests.
     # Per iannucci@, it can be relied upon that solutions[1] is src-internal.
     # Consider managing this in a 'gpu' config.
     del self.m.gclient.c.solutions[1].custom_deps[
         'src/chrome/test/data/perf/frame_rate/private']
 
     self.m.chromium.c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
 
+    # Isolates don't work with the component build yet.
+    # Fortunately, we can easily tell which GPU bots are using the
+    # component build -- all of those building or testing Debug.
+    self._use_isolates = self.m.chromium.is_release_build
+    if self._use_isolates:
+      self.m.isolate.set_isolate_environment(self.m.chromium.c)
+
   def checkout_steps(self):
     # Always force a gclient-revert in order to avoid problems when
     # directories are added to, removed from, and re-added to the repo.
     # crbug.com/329577
     yield self.m.gclient.checkout(revert=True)
     gclient_data = self.m.step_history['gclient sync'].json.output
     self._build_revision = gclient_data['solutions']['src/']['revision']
     # If being run as a try server, apply the CL.
     if 'rietveld' in self.m.properties:
       yield self.m.rietveld.apply_issue(self.m.rietveld.calculate_issue_root())
 
   def compile_steps(self):
     # We only need to runhooks if we're going to compile locally.
     yield self.m.chromium.runhooks()
     # Since performance tests aren't run on the debug builders, it isn't
     # necessary to build all of the targets there.
     build_tag = '' if self.m.chromium.is_release_build else 'debug_'
+    # It's harmless to process the isolate-related targets even if they
+    # aren't supported on the current configuration (because the component
+    # build is used).
     yield self.m.chromium.compile(
         targets=['chromium_gpu_%sbuilder' % build_tag, 'gl_tests_run'])
     # This is only an initial test of the isolate upload path; the
     # subsequent GPU isolates will follow.
     yield self.m.isolate.manifest_to_hash(['gl_tests'])
 
   def upload_steps(self):
     yield self.m.archive.zip_and_upload_build(
       'package_build',
       self.m.chromium.c.build_config_fs,
@@ skipping 25 matching lines @@
         'start_crash_service',
         self.m.path.build('scripts', 'slave', 'chromium',
                           'run_crash_handler.py'),
         ['--build-dir',
          self.m.chromium.c.build_dir,
          '--target',
          self.m.chromium.c.build_config_fs])
 
     # Note: --no-xvfb is the default.
     for test in SIMPLE_TESTS_TO_RUN:
-      yield self.m.chromium.runtests(test, spawn_dbus=True)
+      yield self.m.chromium.runtests(test)
+
+    if self._use_isolates:
+      yield self.m.isolate.run_isolate_test('gl_tests')
+    else:
+      yield self.m.chromium.runtests('gl_tests')
 
     # Choose a reasonable default for the location of the sandbox binary
     # on the bots.
     env = {}
     if self.m.platform.is_linux:
       env['CHROME_DEVEL_SANDBOX'] = '/opt/chromium/chrome_sandbox'
 
     # Google Maps Pixel tests.
     yield self.run_telemetry_gpu_test('maps', name='maps_pixel_test',
         args=[
@@ skipping 84 matching lines @@
     """Returns a step which runs a Telemetry based GPU test (via
     run_gpu_test)."""
 
     test_args = ['-v']
     if args:
       test_args.extend(args)
 
     return self.m.chromium.run_telemetry_test(
         str(self.m.path.checkout('content', 'test', 'gpu', 'run_gpu_test')),
         test, name, test_args, results_directory, spawn_dbus=True)