diff options
| author |  Eric Boren <borenet@google.com> | 2018-05-14 12:50:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-14 17:27:49 +0000 |
| commit | 9030b94c6012c7f02ba91ed352503a44c22764eb (patch) | |
| tree | bd07b3ef1777c6bda58fd965a880b3ef681419bb /infra/bots/recipes/compile.py | |
| parent | 297e86b43e2671c861c3228c474c11fc9a332ca5 (diff) | |
[recipes] Separate build and test flavors
Bug: skia:6473
Change-Id: If1d6e1f64ec53624e7b540abd9d8a61cc82c4e0a
Reviewed-on: https://skia-review.googlesource.com/125947
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.py')
| -rw-r--r-- | infra/bots/recipes/compile.py | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index 2af1601d60..b05f97134f 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -7,6 +7,7 @@ DEPS = [ + 'build', 'core', 'recipe_engine/context', 'recipe_engine/file', @@ -16,17 +17,11 @@ DEPS = [ 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/step', - 'flavor', 'run', 'vars', ] -def build_targets_from_builder_dict(builder_dict): - """Return a list of targets to build, depending on the builder type.""" - return ['most'] - - def RunSteps(api): api.vars.setup() @@ -36,18 +31,12 @@ def RunSteps(api): else: api.core.checkout_bot_update() api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir) - api.flavor.setup() - - build_targets = build_targets_from_builder_dict(api.vars.builder_cfg) try: - for target in build_targets: - api.flavor.compile(target) - api.run.copy_build_products( - api.flavor.out_dir, + api.build() + api.build.copy_build_products( api.vars.swarming_out_dir.join( 'out', api.vars.configuration)) - api.flavor.copy_extra_build_products(api.vars.swarming_out_dir) finally: if 'Win' in api.vars.builder_cfg.get('os', ''): api.python.inline( @@ -62,7 +51,6 @@ for p in psutil.process_iter(): ''', infra_step=True) - api.flavor.cleanup_steps() api.run.check_failure() |