Make blink_trybot recipe work on windows

scripts/slave/recipe_modules/gclient/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
 
 GIT_DEFAULT_WHITELIST = frozenset((
   'tools_build',
 ))
 
@@ skipping 46 matching lines @@
     """Return a step generator function for gclient checkouts."""
     cfg = gclient_config or self.c
     assert cfg.complete()
 
     if not spec_name:
       step_name = lambda n: 'gclient ' + n
     else:
       step_name = lambda n: '[spec: %s] gclient %s' % (spec_name, n)
 
     spec_string = jsonish_to_python(cfg.as_jsonish(), True)
-    gclient = self.m.path.depot_tools('gclient', wrapper=True)
+    gclient = lambda name, *args: self.m.python(
+        name, self.m.path.depot_tools('gclient.py'), args)
 
-    gclient_sync_extra_args = []
+    revisions = []
     for s in cfg.solutions:
       if s.revision is not None:
-        gclient_sync_extra_args += [
-          '--revision', '%s@%s' % (s.name, s.revision)]
+        revisions.extend(['--revision', '%s@%s' % (s.name, s.revision)])
 
     if not cfg.GIT_MODE:
       clean_step = self.revert(step_name)
-      sync_step = self.m.step(step_name('sync'), [
-        gclient, 'sync', '--nohooks'] + gclient_sync_extra_args)
+      sync_step = gclient(
+          step_name('sync'), 'sync', '--nohooks', *revisions)
     else:
       # clean() isn't used because the gclient sync flags passed in checkout()
       # do much the same thing, and they're more correct than doing a separate
       # 'gclient revert' because it makes sure the other args are correct when
       # a repo was deleted and needs to be re-cloned (notably
       # --with_branch_heads), whereas 'revert' uses default args for clone
       # operations.
       #
       # TODO(mmoss): To be like current official builders, this step could just
       # delete the whole <slave_name>/build/ directory and start each build
       # from scratch. That might be the least bad solution, at least until we
       # have a reliable gclient method to produce a pristine working dir for
       # git-based builds (e.g. maybe some combination of 'git reset/clean -fx'
       # and removing the 'out' directory).
       clean_step = None
-      sync_step = self.m.step(step_name('sync'), [
-        gclient, 'sync', '--verbose', '--with_branch_heads', '--nohooks',
-                     '--reset', '--delete_unversioned_trees', '--force'])
+      sync_step = gclient(step_name('sync'),
+        'sync', '--verbose', '--with_branch_heads', '--nohooks',
+        '--reset', '--delete_unversioned_trees', '--force', *revisions)
+
     steps = [
-      self.m.step(
-        step_name('setup'),
-        [gclient, 'config', '--spec', spec_string],
-      ),
+      gclient(step_name('setup'), 'config', '--spec', spec_string)
     ]
     if clean_step:
       steps.append(clean_step)
     if sync_step:
       steps.append(sync_step)
 
     self.m.path.set_checkout(self.m.path.slave_build(cfg.solutions[0].name))
 
     return steps
 
   def revert(self, step_name_fn=lambda x: 'gclient '+x):
     """Return a gclient_safe_revert step."""
-    return self.m.step(
-      step_name_fn('revert'), [
-        'python',
-        self.m.path.build('scripts', 'slave', 'gclient_safe_revert.py'), '.',
-        self.m.path.depot_tools('gclient', wrapper=True)],
+    return self.m.python(
+      step_name_fn('revert'),
+      self.m.path.build('scripts', 'slave', 'gclient_safe_revert.py'),
+      ['.', self.m.path.depot_tools('gclient', wrapper=True)],

[Isaac (away), 2013/06/29 05:34:02]

I think this should be gclient.py.  Recipes should probably enforce gclient is
not called directly because the auto-update mechanism makes builds non-hermetic.

     )