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

Side by Side Diff: scripts/slave/recipes/chromium_trybot.py

Issue 238953003: Point nacl tests to correct browser on 64-bit Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_x64_dbg.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 DEPS = [ 5 DEPS = [
6 'chromium', 6 'chromium',
7 'gclient', 7 'gclient',
8 'itertools', 8 'itertools',
9 'json', 9 'json',
10 'path', 10 'path',
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 351
352 352
353 class NaclIntegrationTest(api.test_utils.Test): # pylint: disable=W0232 353 class NaclIntegrationTest(api.test_utils.Test): # pylint: disable=W0232
354 name = 'nacl_integration' 354 name = 'nacl_integration'
355 355
356 @staticmethod 356 @staticmethod
357 def compile_targets(): 357 def compile_targets():
358 return ['chrome'] 358 return ['chrome']
359 359
360 def run(self, suffix): 360 def run(self, suffix):
361 mode = api.chromium.c.BUILD_CONFIG
Michael Achenbach 2014/04/15 11:09:40 Please try using api.chromium.c.build_config_fs in
Paweł Hajdan Jr. 2014/04/15 11:33:50 Good catch, done.
362 if api.platform.is_win and api.chromium.c.TARGET_BITS == 64:
363 mode += '_x64'
361 args = [ 364 args = [
362 '--mode', api.chromium.c.BUILD_CONFIG, 365 '--mode', mode,
363 '--json_build_results_output_file', api.json.output(), 366 '--json_build_results_output_file', api.json.output(),
364 ] 367 ]
365 return api.python( 368 return api.python(
366 self._step_name(suffix), 369 self._step_name(suffix),
367 api.path['checkout'].join('chrome', 370 api.path['checkout'].join('chrome',
368 'test', 371 'test',
369 'nacl_test_injection', 372 'nacl_test_injection',
370 'buildbot_nacl_integration.py'), 373 'buildbot_nacl_integration.py'),
371 args, 374 args,
372 can_fail_build=False, 375 can_fail_build=False,
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 ) 675 )
673 676
674 yield ( 677 yield (
675 api.test('deapply_compile_failure_linux') + 678 api.test('deapply_compile_failure_linux') +
676 props() + 679 props() +
677 api.platform.name('linux') + 680 api.platform.name('linux') +
678 api.override_step_data('base_unittests (with patch)', 681 api.override_step_data('base_unittests (with patch)',
679 canned_test(passing=False)) + 682 canned_test(passing=False)) +
680 api.step_data('compile (without patch)', retcode=1) 683 api.step_data('compile (without patch)', retcode=1)
681 ) 684 )
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_x64_dbg.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698