aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2018-04-30 07:52:39 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-30 13:34:00 +0000
commit82cb619314cfa68ae6e56a715b60556dbb275cb6 (patch)
treeef00fd267bc8f8e457853072bb929562d35bfb62 /infra
parent12e4e84f7335c26cd5e17b56c09d50210abebd8c (diff)
[infra] Calmbench: fix path to nanobench executable
Bug: skia:7883 Change-Id: Id363d59d2466c3f4fae8a79e6ad9e6c270e445ae Reviewed-on: https://skia-review.googlesource.com/124403 Commit-Queue: Eric Boren <borenet@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com> Auto-Submit: Eric Boren <borenet@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json4
-rw-r--r--infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json4
-rw-r--r--infra/bots/recipes/calmbench.py6
3 files changed, 7 insertions, 7 deletions
diff --git a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json
index 88bbbc82ac..a61a89ccc0 100644
--- a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json
+++ b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json
@@ -92,8 +92,8 @@
"[START_DIR]/[SWARM_OUT_DIR]",
"modified",
"master",
- "[START_DIR]/out/Release/nanobench",
- "[START_DIR]/ParentRevision/out/Release/nanobench",
+ "[START_DIR]/build/out/Release/nanobench",
+ "[START_DIR]/build/ParentRevision/out/Release/nanobench",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp --mpd false",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp --mpd false",
"2",
diff --git a/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json b/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json
index f93b8b7521..eafa9fcc58 100644
--- a/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json
+++ b/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json
@@ -92,8 +92,8 @@
"[START_DIR]/[SWARM_OUT_DIR]",
"modified",
"master",
- "[START_DIR]/out/Release/nanobench",
- "[START_DIR]/ParentRevision/out/Release/nanobench",
+ "[START_DIR]/build/out/Release/nanobench",
+ "[START_DIR]/build/ParentRevision/out/Release/nanobench",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp",
"2",
diff --git a/infra/bots/recipes/calmbench.py b/infra/bots/recipes/calmbench.py
index 16f5d8aa7d..45aa88c4a4 100644
--- a/infra/bots/recipes/calmbench.py
+++ b/infra/bots/recipes/calmbench.py
@@ -41,9 +41,9 @@ def RunSteps(api):
api.vars.skia_dir.join('tools', 'calmbench', 'ab.py'),
api.vars.swarming_out_dir,
'modified', 'master',
- api.path['start_dir'].join("out", api.vars.configuration, 'nanobench'),
- api.path['start_dir'].join("ParentRevision", "out",
- api.vars.configuration, '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