Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/api.py

Issue 1811953003: Revert of ensure_goma for goma canary (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import collections 5 import collections
6 import contextlib 6 import contextlib
7 import copy 7 import copy
8 import itertools 8 import itertools
9 import json 9 import json
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 for c in bot_config.get('gclient_apply_config', []): 125 for c in bot_config.get('gclient_apply_config', []):
126 self.m.gclient.apply_config(c) 126 self.m.gclient.apply_config(c)
127 127
128 # WARNING: src-side runtest.py is only tested with chromium CQ builders. 128 # WARNING: src-side runtest.py is only tested with chromium CQ builders.
129 # Usage not covered by chromium CQ is not supported and can break 129 # Usage not covered by chromium CQ is not supported and can break
130 # without notice. 130 # without notice.
131 if bot_config.get_master_setting('src_side_runtest_py'): 131 if bot_config.get_master_setting('src_side_runtest_py'):
132 self.m.chromium.c.runtest_py.src_side = True 132 self.m.chromium.c.runtest_py.src_side = True
133 133
134 # TODO(ukai): switch to ensure_goma in chromium/api.py
135 if bot_config.get('goma_canary'): 134 if bot_config.get('goma_canary'):
136 self.m.goma.update_goma_canary() 135 self.m.goma.update_goma_canary()
137 136
138 bot_type = override_bot_type or bot_config.get('bot_type', 'builder_tester') 137 bot_type = override_bot_type or bot_config.get('bot_type', 'builder_tester')
139 138
140 if bot_config.get('set_component_rev'): 139 if bot_config.get('set_component_rev'):
141 # If this is a component build and the main revision is e.g. blink, 140 # If this is a component build and the main revision is e.g. blink,
142 # webrtc, or v8, the custom deps revision of this component must be 141 # webrtc, or v8, the custom deps revision of this component must be
143 # dynamically set to either: 142 # dynamically set to either:
144 # (1) the revision of the builder if this is a tester, 143 # (1) the revision of the builder if this is a tester,
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 def get_compile_targets_for_scripts(self): 835 def get_compile_targets_for_scripts(self):
837 return self.m.python( 836 return self.m.python(
838 name='get compile targets for scripts', 837 name='get compile targets for scripts',
839 script=self.m.path['checkout'].join( 838 script=self.m.path['checkout'].join(
840 'testing', 'scripts', 'get_compile_targets.py'), 839 'testing', 'scripts', 'get_compile_targets.py'),
841 args=[ 840 args=[
842 '--output', self.m.json.output(), 841 '--output', self.m.json.output(),
843 '--', 842 '--',
844 ] + self.get_common_args_for_scripts(), 843 ] + self.get_common_args_for_scripts(),
845 step_test_data=lambda: self.m.json.test_api.output({})) 844 step_test_data=lambda: self.m.json.test_api.output({}))
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium/config.py ('k') | scripts/slave/recipe_modules/goma/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698