diff options
| author |  Eric Boren <borenet@google.com> | 2018-05-18 07:36:55 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-18 11:58:14 +0000 |
| commit | 72f6668eb73405874155b7b03077230559ee681e (patch) | |
| tree | 4dc8de37518a9e442ac8ec15f727fd32c6b312a4 /infra/bots/recipes/calmbench.py | |
| parent | 50edafacc8ea56bdc13fd2234618fe06094eec0e (diff) | |
[recipes] Move a lot of logic out of vars module
In general, vars should only contain variables which are the same for
all tasks. Variables specific to compilation belong in the build
module (or compile recipe), and those specific to running tests belong
in the flavor module, or the individual recipe which uses them.
Bug: skia:6473
Change-Id: Ifd55a57118c5801e6f4934a6b5de9d1567415b9a
Reviewed-on: https://skia-review.googlesource.com/128545
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/calmbench.py')
| -rw-r--r-- | infra/bots/recipes/calmbench.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/infra/bots/recipes/calmbench.py b/infra/bots/recipes/calmbench.py index 30343f2712..f75cd35d72 100644 --- a/infra/bots/recipes/calmbench.py +++ b/infra/bots/recipes/calmbench.py @@ -28,7 +28,8 @@ def RunSteps(api): api.flavor.install(skps=True, svgs=True) api.file.ensure_directory('makedirs perf', api.vars.swarming_out_dir) - with api.context(cwd=api.vars.skia_dir): + skia_dir = api.path['start_dir'].join('skia') + with api.context(cwd=skia_dir): extra_arg = '--svgs %s --skps %s' % (api.flavor.device_dirs.svg_dir, api.flavor.device_dirs.skp_dir) @@ -41,7 +42,7 @@ def RunSteps(api): command = [ 'python', - api.vars.skia_dir.join('tools', 'calmbench', 'ab.py'), + skia_dir.join('tools', 'calmbench', 'ab.py'), api.vars.swarming_out_dir, 'modified', 'master', api.vars.build_dir.join("out", api.vars.configuration, 'nanobench'), @@ -53,7 +54,7 @@ def RunSteps(api): config, -1, # threads; let ab.py decide the threads "false", # noinit - "--githash", api.vars.got_revision, + "--githash", api.properties['revision'], "--concise" ] |