diff options
author | 2018-06-01 11:53:42 +0000 | |
---|---|---|
committer | 2018-06-01 11:53:46 +0000 | |
commit | fbe7166685b860a530ebe545aef5596c6a86c403 (patch) | |
tree | 794a46b6d3b643ccdbac3d719155dedb38101cd0 /infra/bots/recipes/calmbench.py | |
parent | 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b (diff) |
Revert "[recipes] Isolate build outputs with no subdirs"
This reverts commit 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b.
Reason for revert: Broke iOS and SwiftShader (and maybe others)
Original change's description:
> [recipes] Isolate build outputs with no subdirs
>
> Bug: skia:6473
> Change-Id: If243b6afb748529d2bdb212e360cd4338edc929c
> Reviewed-on: https://skia-review.googlesource.com/130942
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
TBR=borenet@google.com,benjaminwagner@google.com
Change-Id: Icf9490f2f88dc454c6d971f35258e219137b0c0e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6473
Reviewed-on: https://skia-review.googlesource.com/131400
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/calmbench.py')
-rw-r--r-- | infra/bots/recipes/calmbench.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/infra/bots/recipes/calmbench.py b/infra/bots/recipes/calmbench.py index c96a082ea5..659b3a4f02 100644 --- a/infra/bots/recipes/calmbench.py +++ b/infra/bots/recipes/calmbench.py @@ -44,8 +44,9 @@ def RunSteps(api): skia_dir.join('tools', 'calmbench', 'ab.py'), api.vars.swarming_out_dir, 'modified', 'master', - api.vars.build_dir.join('nanobench'), - api.vars.build_dir.join('ParentRevision', 'nanobench'), + api.vars.build_dir.join("out", api.vars.configuration, 'nanobench'), + api.vars.build_dir.join("ParentRevision", "out", + api.vars.configuration, 'nanobench'), extra_arg, extra_arg, 2, # reps "false", # skipbase |