Modify Skia recipes to allow running XSAN on Swarming.

scripts/slave/recipe_modules/skia/api.py

 # Copyright 2014 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.
 
 
 import json
 import os
 import re
 import sys
 
@@ skipping 64 matching lines @@
 def is_ios(builder_cfg):
   return ('iOS' in builder_cfg.get('extra_config', '') or
           builder_cfg.get('os') == 'iOS')
 
 
 def is_valgrind(builder_cfg):
   return 'Valgrind' in builder_cfg.get('extra_config', '')
 
 
 def is_xsan(builder_cfg):
-  return (builder_cfg.get('extra_config') == 'ASAN' or
-          builder_cfg.get('extra_config') == 'MSAN' or
-          builder_cfg.get('extra_config') == 'TSAN')
+  return ('ASAN' in builder_cfg.get('extra_config', '') or
+          'MSAN' in builder_cfg.get('extra_config', '') or
+          'TSAN' in builder_cfg.get('extra_config', ''))
 
 
 class SkiaApi(recipe_api.RecipeApi):
 
   def get_flavor(self, builder_cfg):
     """Return a flavor utils object specific to the given builder."""
     if is_appurify(builder_cfg):
       return appurify_flavor.AppurifyFlavorUtils(self)
     elif is_android(builder_cfg):
       return android_flavor.AndroidFlavorUtils(self)
@@ skipping 86 matching lines @@
 
     # We run through this recipe in one of two ways:
     # 1. Normal bot: run all of the steps.
     # 2. Running as a Swarming task: perform the given task only, with
     #    adaptations for running within Swarming, eg. copying build results
     #    into the correct output directory.
     self.running_in_swarming = running_in_swarming
 
     # Some bots also require a checkout of chromium.
     self._need_chromium_checkout = 'CommandBuffer' in self.builder_name
+    if (self.running_in_swarming and
+        self.is_compile_bot and
+        'SAN' in self.builder_name):
+      self._need_chromium_checkout = True
 
     # Check out the Skia code.
     self.checkout_steps()
 
     # Obtain the spec for this builder from the Skia repo. Use it to set more
     # properties.
     self.builder_spec = self.get_builder_spec(self.skia_dir, self.builder_name)
 
     self.builder_cfg = self.builder_spec['builder_cfg']
     self.role = self.builder_cfg['role']
 
     # Set some important variables.
     self.resource_dir = self.skia_dir.join('resources')
     self.images_dir = self.slave_dir.join('images')
     self.skia_out = self.skia_dir.join('out', self.builder_name)
     if self.running_in_swarming:
-      self.swarming_out_dir = self.m.properties['swarm_out_dir']
+      self.swarming_out_dir = self.make_path(self.m.properties['swarm_out_dir'])
       self.local_skp_dir = self.slave_dir.join('skps')
       if not self.is_compile_bot:
         self.skia_out = self.slave_dir.join('out')
     else:
       self.local_skp_dir = self.slave_dir.join('playback', 'skps')
     self.tmp_dir = self.m.path['slave_build'].join('tmp')
 
     self.gsutil_env_chromium_skia_gm = self.gsutil_env(BOTO_CHROMIUM_SKIA_GM)
 
     self.device_dirs = None
@@ skipping 121 matching lines @@
     if self.running_in_swarming:
       checkout_kwargs['env'] = self.default_env
     update_step = self.m.gclient.checkout(gclient_config=gclient_cfg,
                                           cwd=self.checkout_root,
                                           **checkout_kwargs)
 
     self.got_revision = update_step.presentation.properties['got_revision']
     self.m.tryserver.maybe_apply_issue()
 
     if self._need_chromium_checkout:
-      self.m.gclient.runhooks()
+      self.m.gclient.runhooks(cwd=self.checkout_root)
 
   def copy_build_products(self, src, dst):
     """Copy whitelisted build products from src to dst."""
     self.m.python.inline(
         name='copy build products',
         program='''import errno
 import glob
 import os
 import shutil
 import sys
@@ skipping 21 matching lines @@
         infra_step=True)
 
   def compile_steps(self, clobber=False):
     """Run the steps to build Skia."""
     try:
       for target in self.build_targets:
         self.flavor.compile(target)
       if self.running_in_swarming:
         self.copy_build_products(
             self.flavor.out_dir,
-            self.m.path.join(self.swarming_out_dir, 'out', self.configuration))
+            self.swarming_out_dir.join('out', self.configuration))
+        self.flavor.copy_extra_build_products(self.swarming_out_dir)
     finally:
       if 'Win' in self.builder_cfg.get('os', ''):
         self.m.python.inline(
             name='cleanup',
             program='''import psutil
 for p in psutil.process_iter():
   try:
     if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):
       p.kill()
   except psutil._error.AccessDenied:
@@ skipping 483 matching lines @@
     # Don't bother to include role, which is always Test.
     # TryBots are uploaded elsewhere so they can use the same key.
     blacklist = ['role', 'is_trybot']
 
     flat = []
     for k in sorted(self.builder_cfg.keys()):
       if k not in blacklist:
         flat.append(k)
         flat.append(self.builder_cfg[k])
     return flat