chromium_tests: set cwd to directory containing checkout for tests

scripts/slave/recipe_modules/chromium_tests/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 collections
 import contextlib
 import copy
 import itertools
 import json
 
@@ skipping 32 matching lines @@
 })
 
 
 class ChromiumTestsApi(recipe_api.RecipeApi):
   def __init__(self, *args, **kwargs):
     super(ChromiumTestsApi, self).__init__(*args, **kwargs)
     self._builders = {}
     self.add_builders(builders.BUILDERS)
     self._precommit_mode = False
 
+    # Keep track of working directory (which contains the checkout).
+    # None means "default value".
+    self._working_dir = None
+
   @property
   def builders(self):
     return self._builders
 
   @property
   def steps(self):
     return steps
 
   @property
   def trybots(self):
@@ skipping 96 matching lines @@
       builder_cache = self.m.path['builder_cache']
     except KeyError:  # no-op if builder cache is not set up.
       pass
     else:
       sanitized_buildername = ''.join(
           c if c.isalnum() else '_' for c in self.m.properties['buildername'])
       checkout_path = builder_cache.join(
           bot_config.get('checkout_dir', sanitized_buildername))
       self.m.shutil.makedirs('checkout path', checkout_path)
       kwargs['cwd'] = checkout_path
+      self._working_dir = checkout_path
 
     # Bot Update re-uses the gclient configs.
     update_step = self.m.bot_update.ensure_checkout(
         patch_root=bot_config.get('patch_root'),
         root_solution_revision=root_solution_revision,
         clobber=bot_config.get('clobber', False),
         force=force, **kwargs)
     assert update_step.json.output['did_run']
     # HACK(dnj): Remove after 'crbug.com/398105' has landed
     self.m.chromium.set_build_properties(update_step.json.output['properties'])
@@ skipping 333 matching lines @@
 
   def _make_legacy_build_url(self, master_config, mastername):
     return self.m.archive.legacy_download_url(
                master_config.get('build_gs_bucket'),
                extra_url_components=(
                    None if mastername.startswith('chromium.perf')
                    else self.m.properties['mastername']))
 
   @contextlib.contextmanager
   def wrap_chromium_tests(self, bot_config, tests=None):
-    with self.m.step.context({'env': self.m.chromium.get_env()}):
+    context = {'env': self.m.chromium.get_env()}
+    # TODO(phajdan.jr): Enable globally after confirming it works.
+    if bot_config.matches_any_bot_id(
+        lambda bot_id: 'remote_run' in bot_id['buildername'] or
+                       'remote_run' in bot_id.get('tester', '')):
+      context['cwd'] = self._working_dir
+    with self.m.step.context(context):
       bot_type = bot_config.get('bot_type', 'builder_tester')
 
       if bot_type in ('tester', 'builder_tester'):
         isolated_targets = [
             t.isolate_target(self.m) for t in tests if t.uses_swarming]
         if isolated_targets:
           self.m.isolate.find_isolated_tests(self.m.chromium.output_dir)
 
       if bot_type == 'tester':
         if (self.m.chromium.c.TARGET_PLATFORM == 'android' and
@@ skipping 296 matching lines @@
   def get_compile_targets_for_scripts(self):
     return self.m.python(
         name='get compile targets for scripts',
         script=self.m.path['checkout'].join(
             'testing', 'scripts', 'get_compile_targets.py'),
         args=[
             '--output', self.m.json.output(),
             '--',
         ] + self.get_common_args_for_scripts(),
         step_test_data=lambda: self.m.json.test_api.output({}))