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

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

Issue 1185693002: Move builders.py and steps.py to chromium_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Address review comments. Created 5 years, 6 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
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | scripts/slave/recipes/chromium_trybot.py » ('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 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 from infra.libs.infra_types import freeze 5 from infra.libs.infra_types import freeze
6 6
7 DEPS = [ 7 DEPS = [
8 'bot_update', 8 'bot_update',
9 'chromium', 9 'chromium',
10 'chromium_tests', 10 'chromium_tests',
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 api.chromium.runhooks() 451 api.chromium.runhooks()
452 452
453 api.chromium.run_mb(mastername, buildername, use_goma=True) 453 api.chromium.run_mb(mastername, buildername, use_goma=True)
454 454
455 # TODO(dpranke): Unify this with the logic in the chromium_trybot and 455 # TODO(dpranke): Unify this with the logic in the chromium_trybot and
456 # chromium recipes so that we can actually run the tests as well 456 # chromium recipes so that we can actually run the tests as well
457 # and deapply patches and retry as need be. 457 # and deapply patches and retry as need be.
458 test_spec_file = '%s.json' % mastername 458 test_spec_file = '%s.json' % mastername
459 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) 459 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file)
460 460
461 tests = list(api.chromium.steps.generate_gtest( 461 tests = list(api.chromium_tests.steps.generate_gtest(
462 api, mastername, buildername, test_spec)) 462 api, mastername, buildername, test_spec))
463 463
464 scripts_compile_targets = \ 464 scripts_compile_targets = \
465 api.chromium.get_compile_targets_for_scripts().json.output 465 api.chromium_tests.get_compile_targets_for_scripts().json.output
466 tests += list(api.chromium.steps.generate_script( 466 tests += list(api.chromium_tests.steps.generate_script(
467 api, mastername, buildername, test_spec, 467 api, mastername, buildername, test_spec,
468 scripts_compile_targets=scripts_compile_targets)) 468 scripts_compile_targets=scripts_compile_targets))
469 469
470 additional_compile_targets = test_spec.get(buildername, {}).get( 470 additional_compile_targets = test_spec.get(buildername, {}).get(
471 'additional_compile_targets', 471 'additional_compile_targets',
472 ['chrome_shell_apk' if is_android else 'all']) 472 ['chrome_shell_apk' if is_android else 'all'])
473 473
474 if api.tryserver.is_tryserver: 474 if api.tryserver.is_tryserver:
475 affected_files = api.tryserver.get_files_affected_by_patch() 475 affected_files = api.tryserver.get_files_affected_by_patch()
476 476
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 'gtest_tests': ['base_unittests'], 577 'gtest_tests': ['base_unittests'],
578 }})) + 578 }})) +
579 api.override_step_data( 579 api.override_step_data(
580 'analyze', 580 'analyze',
581 api.json.output({ 581 api.json.output({
582 'status': 'Found dependency', 582 'status': 'Found dependency',
583 'targets': ['net_unittests'], 583 'targets': ['net_unittests'],
584 'build_targets': ['net_unittests'], 584 'build_targets': ['net_unittests'],
585 })) 585 }))
586 ) 586 )
OLDNEW
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | scripts/slave/recipes/chromium_trybot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698