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

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: fixes 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
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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 args = [ 361 args = [
362 '--mode', api.chromium.c.BUILD_CONFIG, 362 '--mode', api.chromium.c.build_config_fs,
363 '--json_build_results_output_file', api.json.output(), 363 '--json_build_results_output_file', api.json.output(),
364 ] 364 ]
365 return api.python( 365 return api.python(
366 self._step_name(suffix), 366 self._step_name(suffix),
367 api.path['checkout'].join('chrome', 367 api.path['checkout'].join('chrome',
368 'test', 368 'test',
369 'nacl_test_injection', 369 'nacl_test_injection',
370 'buildbot_nacl_integration.py'), 370 'buildbot_nacl_integration.py'),
371 args, 371 args,
372 can_fail_build=False, 372 can_fail_build=False,
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 ) 672 )
673 673
674 yield ( 674 yield (
675 api.test('deapply_compile_failure_linux') + 675 api.test('deapply_compile_failure_linux') +
676 props() + 676 props() +
677 api.platform.name('linux') + 677 api.platform.name('linux') +
678 api.override_step_data('base_unittests (with patch)', 678 api.override_step_data('base_unittests (with patch)',
679 canned_test(passing=False)) + 679 canned_test(passing=False)) +
680 api.step_data('compile (without patch)', retcode=1) 680 api.step_data('compile (without patch)', retcode=1)
681 ) 681 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698