diff options
Diffstat (limited to 'infra/bots/recipes')
195 files changed, 2111 insertions, 3632 deletions
diff --git a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json index 69a60c3555..fe910f553f 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -156,7 +156,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Extract all fiddles out of md files" }, @@ -177,7 +177,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Force fiddle to compile all examples" }, @@ -213,7 +213,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Output fiddleout.json" }, @@ -238,7 +238,7 @@ "python", "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_md.py", "--bookmaker_binary", - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "--fiddlecli_output", "[START_DIR]/fiddleout.json", "--gitcookies", @@ -251,7 +251,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Generate and Upload Markdown files" }, diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json index e5f591f9bd..05ef73d2b4 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -156,7 +156,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Extract all fiddles out of md files", "~followup_annotations": [ diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json index db15d5b9f5..51e7ad93e4 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -156,7 +156,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Extract all fiddles out of md files" }, @@ -177,7 +177,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Force fiddle to compile all examples", "~followup_annotations": [ diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json index f2ea70cb9f..7b32c70f4c 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -156,7 +156,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Extract all fiddles out of md files" }, @@ -177,7 +177,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Force fiddle to compile all examples" }, @@ -213,7 +213,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Output fiddleout.json" }, diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json index c39f12d9c3..521c65df97 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -156,7 +156,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Extract all fiddles out of md files" }, @@ -177,7 +177,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Force fiddle to compile all examples" }, @@ -202,7 +202,7 @@ "python", "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_md.py", "--bookmaker_binary", - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "--fiddlecli_output", "[START_DIR]/fiddleout.json", "--gitcookies", @@ -215,7 +215,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Generate and Upload Markdown files", "~followup_annotations": [ diff --git a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json index 4294790c4c..1e8959e1cf 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-x" @@ -155,7 +155,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Validate docs match include/core/*.h" }, diff --git a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json index b91cf84486..ca2b369349 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,13 +137,13 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go get fiddlecli" }, { "cmd": [ - "[START_DIR]/build/out/Release/bookmaker", + "[START_DIR]/out/Release/bookmaker", "-a", "docs/status.json", "-x" @@ -155,7 +155,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Validate docs match include/core/*.h", "~followup_annotations": [ diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json new file mode 100644 index 0000000000..1cf232b276 --- /dev/null +++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json @@ -0,0 +1,61 @@ +[ + { + "cmd": [ + "git", + "init" + ], + "cwd": "[START_DIR]/skia", + "env": { + "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>" + }, + "infra_step": true, + "name": "git init" + }, + { + "cmd": [ + "git", + "add", + "." + ], + "cwd": "[START_DIR]/skia", + "env": { + "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>" + }, + "infra_step": true, + "name": "git add" + }, + { + "cmd": [ + "git", + "commit", + "-m", + "commit recipes" + ], + "cwd": "[START_DIR]/skia", + "env": { + "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>" + }, + "infra_step": true, + "name": "git commit" + }, + { + "cmd": [ + "python", + "[START_DIR]/skia/infra/bots/recipes.py", + "bundle", + "--destination", + "[SWARM_OUT_DIR]/recipe_bundle" + ], + "cwd": "[START_DIR]/skia", + "env": { + "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>" + }, + "infra_step": true, + "name": "Bundle Recipes" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/bundle_recipes.py b/infra/bots/recipes/bundle_recipes.py new file mode 100644 index 0000000000..49310af55a --- /dev/null +++ b/infra/bots/recipes/bundle_recipes.py @@ -0,0 +1,40 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +# Recipe module for Skia Swarming compile. + + +DEPS = [ + 'git', + 'recipe_engine/context', + 'recipe_engine/path', + 'recipe_engine/properties', + 'recipe_engine/step', +] + + +def RunSteps(api): + bundle_dir = api.properties['swarm_out_dir'] + '/recipe_bundle' + skia_dir = api.path['start_dir'].join('skia') + recipes_py = api.path['start_dir'].join('skia', 'infra', 'bots', 'recipes.py') + with api.git.env(): + with api.context(cwd=skia_dir): + api.step('git init', infra_step=True, + cmd=['git', 'init']) + api.step('git add', infra_step=True, + cmd=['git', 'add', '.']) + api.step('git commit', infra_step=True, + cmd=['git', 'commit', '-m', 'commit recipes']) + api.step('Bundle Recipes', infra_step=True, + cmd=['python', recipes_py, 'bundle', + '--destination', bundle_dir]) + + +def GenTests(api): + yield ( + api.test('BundleRecipes') + + api.properties(buildername='Housekeeper-PerCommit-BundleRecipes', + swarm_out_dir='[SWARM_OUT_DIR]') + ) 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 f7440a5033..c03c039c8f 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 @@ -74,7 +74,7 @@ "cmd": [ "python", "[START_DIR]/skia/tools/calmbench/ab.py", - "[START_DIR]/[SWARM_OUT_DIR]", + "[CUSTOM_[SWARM_OUT_DIR]]", "modified", "master", "[START_DIR]/out/Release/nanobench", @@ -108,7 +108,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Run calmbench" }, 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 9d126b8106..0148d71e78 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 @@ -74,7 +74,7 @@ "cmd": [ "python", "[START_DIR]/skia/tools/calmbench/ab.py", - "[START_DIR]/[SWARM_OUT_DIR]", + "[CUSTOM_[SWARM_OUT_DIR]]", "modified", "master", "[START_DIR]/out/Release/nanobench", @@ -108,7 +108,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Run calmbench" }, diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 7e9314a9f6..99eb9aaea2 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -119,7 +119,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "git diff #1", "stdout": "/path/to/tmp/" @@ -135,7 +135,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "touch fp files", "~followup_annotations": [ @@ -162,7 +162,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -178,7 +178,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-clang-format" @@ -187,7 +187,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "--args=is_debug=false skia_compile_processors=true" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -195,7 +195,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -205,14 +205,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -227,7 +227,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "git diff #2", "stdout": "/path/to/tmp/" @@ -243,7 +243,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "compare diffs", "~followup_annotations": [ diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json index 9c1347a57a..84b602586a 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json @@ -167,7 +167,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json index d599a982a7..334d2260d4 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 0289a8c90a..121fcf35fe 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json index 33caf89374..a750df81b3 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json index a37663135b..22c57ee902 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json index f39e749913..a32d2c5036 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json index 2e6cc03228..7ea5e04b65 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 3d768982e8..dbf96708a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json index 4609686176..2806f09130 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json index baeb043392..823b946a5b 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json @@ -164,7 +164,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json index c6401011a0..ba6d6c8e84 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json index c68d6efc05..b61f534eb7 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json index 85624d0ab7..8c3afd81e2 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json @@ -133,7 +133,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json index ef650cb57e..dc32da577e 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json index dd557b5bc1..221d515fd7 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json b/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json index 99b1593c2c..e311fa2ecd 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json index 32fcb01603..60a3e5d0a6 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json @@ -164,7 +164,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-arm-Release-Chromecast/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json index 0988830980..28c30031f7 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86-Debug/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json index 0c64b0cba0..e8e988a752 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index 28197f8e70..ae77d1bf4a 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json index f69793f25d..a1ab4819fd 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json @@ -262,7 +262,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json index 2dc4275ea4..9c99ec2cb1 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json @@ -121,9 +121,6 @@ "https://chromium.googlesource.com/chromium/tools/depot_tools.git" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "name": "git setup" }, { @@ -136,7 +133,6 @@ ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", "env": { - "DEPOT_TOOLS_UPDATE": "0", "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" }, "infra_step": true, @@ -150,9 +146,6 @@ "06493714339009216197d59c5413da2a1efdf4a2" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "git checkout" }, @@ -163,9 +156,6 @@ "HEAD" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "read revision", "stdout": "/path/to/tmp/", @@ -182,9 +172,6 @@ "-x" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "git clean" }, @@ -195,9 +182,6 @@ "sync" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "submodule sync" }, @@ -210,9 +194,6 @@ "--recursive" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "submodule update" }, @@ -226,7 +207,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -242,7 +222,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -260,7 +239,6 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -278,7 +256,6 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -290,7 +267,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json index 8a2383a2bc..f75b4c9e6d 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -121,9 +121,6 @@ "https://chromium.googlesource.com/chromium/tools/depot_tools.git" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "name": "git setup" }, { @@ -136,7 +133,6 @@ ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", "env": { - "DEPOT_TOOLS_UPDATE": "0", "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" }, "infra_step": true, @@ -150,9 +146,6 @@ "06493714339009216197d59c5413da2a1efdf4a2" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "git checkout" }, @@ -163,9 +156,6 @@ "HEAD" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "read revision", "stdout": "/path/to/tmp/", @@ -182,9 +172,6 @@ "-x" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "git clean" }, @@ -195,9 +182,6 @@ "sync" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "submodule sync" }, @@ -210,9 +194,6 @@ "--recursive" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "submodule update" }, @@ -226,7 +207,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, @@ -242,7 +222,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, @@ -260,7 +239,6 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, @@ -278,7 +256,6 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, @@ -290,7 +267,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json index 3dc69c4661..65afdd3e33 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index 5947f190cc..7775face41 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index d011552022..354470d148 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index 952ba1327a..541f4416b1 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index d9b323a8ca..bd0ecacd2b 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -191,7 +191,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "GYP_CHROMIUM_NO_ACTION": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" @@ -274,7 +273,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index f4eb37af08..3d402c41f8 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -148,7 +148,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index 77b178832f..16233726f5 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release", - "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Release" + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json index 3f2c05a1b7..b49cd3676a 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug", - "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug" + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index 74e4687d5c..a5087d35fe 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug", - "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug" + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json index 04ec5b0bde..f7b9e22de9 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE\\Debug_x64", - "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug_x64" + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug_x64" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index 9c662d0a46..6a906a3e85 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64", - "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Release_x64" + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Release_x64" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 1f2410ca26..d7baedd595 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -162,7 +162,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release_x64" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release_x64" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index c821fecd31..7963e56f1a 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -266,7 +266,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index 4da343c388..5816e4a574 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -125,9 +125,6 @@ "https://chromium.googlesource.com/chromium/tools/depot_tools.git" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "name": "git setup" }, { @@ -140,7 +137,6 @@ ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", "env": { - "DEPOT_TOOLS_UPDATE": "0", "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" }, "infra_step": true, @@ -154,9 +150,6 @@ "06493714339009216197d59c5413da2a1efdf4a2" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "git checkout" }, @@ -167,9 +160,6 @@ "HEAD" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "read revision", "stdout": "/path/to/tmp/", @@ -186,9 +176,6 @@ "-x" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "git clean" }, @@ -199,9 +186,6 @@ "sync" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "submodule sync" }, @@ -214,9 +198,6 @@ "--recursive" ], "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, "infra_step": true, "name": "submodule update" }, @@ -230,7 +211,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -246,7 +226,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -264,7 +243,6 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -282,7 +260,6 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, @@ -294,7 +271,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium/Release", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 6c30e1a347..7e949331dc 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -166,7 +166,7 @@ "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", - "[START_DIR]/[SWARM_OUT_DIR]/out/Release_x64" + "[CUSTOM_[SWARM_OUT_DIR]]/out/Release_x64" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 551554f81e..0b4d77225c 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index de43f2dba3..b65cffcbb6 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index b13bee0509..5af1c4a3b5 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 27a865201e..9cd19b256e 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -137,7 +137,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -146,7 +146,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -154,7 +154,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -164,14 +164,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -180,7 +180,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index ec2d97d55d..f440ff1825 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 03368f5213..c072a343df 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 6104882393..a74c21047f 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 651ff14872..23ca6dd95b 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 34d114203a..03f1abd703 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"] is_debug=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Release", + "[START_DIR]/out/Release", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index a1c287dc39..3b819afb0c 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 288767f981..edde2c9a8b 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -133,7 +133,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -142,7 +142,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -150,7 +150,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -160,14 +160,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -176,7 +176,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index d2031fdc30..e12d068952 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -137,7 +137,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "fetch-gn" @@ -146,7 +146,7 @@ "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-static-libstdc++\", \"-static-libgcc\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -154,7 +154,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -164,14 +164,14 @@ "-k", "0", "-C", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, @@ -180,7 +180,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[START_DIR]/build/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "infra_step": true, diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 161047a5db..7d57a29557 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -122,7 +122,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "infra_step": true, @@ -133,11 +133,11 @@ "python", "RECIPE_MODULE[skia::core]/resources/run_binary_size_analysis.py", "--library", - "[START_DIR]/build/out/Release/libskia.so", + "[START_DIR]/out/Release/libskia.so", "--githash", "abc123", "--dest", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json", "--issue_number", "456789" ], @@ -146,7 +146,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate binary size data" }, diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index c7cfb77fc2..f9b13d8a7b 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -118,7 +118,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate and upload doxygen" }, @@ -132,7 +132,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "infra_step": true, @@ -143,18 +143,18 @@ "python", "RECIPE_MODULE[skia::core]/resources/run_binary_size_analysis.py", "--library", - "[START_DIR]/build/out/Release/libskia.so", + "[START_DIR]/out/Release/libskia.so", "--githash", "abc123", "--dest", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate binary size data" }, diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index 4b29cb9beb..00dfddc6a5 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,7 +137,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs", "~followup_annotations": [ @@ -159,7 +159,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 2)", "~followup_annotations": [ @@ -181,7 +181,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 3)", "~followup_annotations": [ @@ -203,7 +203,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 4)", "~followup_annotations": [ @@ -225,7 +225,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 5)", "~followup_annotations": [ diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index 4e3b09e266..a6393e2ab7 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,7 +137,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs", "~followup_annotations": [ @@ -159,7 +159,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs (attempt 2)" }, diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index f86eb5e7c6..ce637afd36 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.json @@ -104,7 +104,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -119,7 +119,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -137,7 +137,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json index 7f7c344220..e2d9e55162 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -540,7 +540,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -548,7 +548,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -568,7 +568,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -585,7 +585,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -601,7 +601,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -618,7 +618,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -642,13 +642,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -682,7 +682,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json index 249b66e8c2..3e6b006290 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -549,7 +549,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -593,7 +593,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -668,7 +668,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Lock GPU to 450000000 (and other perf tweaks)", @@ -724,7 +724,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -732,7 +732,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -752,7 +752,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -769,7 +769,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -785,7 +785,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -802,7 +802,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -826,13 +826,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -866,7 +866,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json index 8a7ae1deee..235f2afc13 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 4's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000", @@ -705,7 +705,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Disabling CPU 0", @@ -757,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Disabling CPU 1", @@ -809,7 +809,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Disabling CPU 2", @@ -861,7 +861,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Disabling CPU 3", @@ -912,7 +912,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Lock GPU to 600000000 (and other perf tweaks)", @@ -968,7 +968,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -976,7 +976,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -996,7 +996,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -1013,7 +1013,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -1029,7 +1029,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -1046,7 +1046,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -1075,7 +1075,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android" ], "infra_step": true, "name": "makedirs perf_dir" @@ -1085,30 +1085,30 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1142,7 +1142,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index c3ebab5f98..fbf44b6cb1 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -696,7 +696,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -704,7 +704,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -724,7 +724,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -741,7 +741,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -757,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -774,7 +774,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -803,7 +803,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android" ], "infra_step": true, "name": "makedirs perf_dir" @@ -813,30 +813,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -870,7 +870,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json index e914aecdfd..a975329724 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -696,7 +696,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -704,7 +704,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -724,7 +724,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -741,7 +741,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -757,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -774,7 +774,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -803,7 +803,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android" ], "infra_step": true, "name": "makedirs perf_dir" @@ -813,30 +813,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -870,7 +870,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json index dc0825c0f9..b6163c252e 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -705,7 +705,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -749,7 +749,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -816,7 +816,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -824,7 +824,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -844,7 +844,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -861,7 +861,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -877,7 +877,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -894,7 +894,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -923,7 +923,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android" ], "infra_step": true, "name": "makedirs perf_dir" @@ -933,30 +933,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -990,7 +990,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index c8f0989f2b..b899348b4c 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -705,7 +705,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -749,7 +749,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -816,7 +816,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -824,7 +824,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -844,7 +844,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -861,7 +861,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -877,7 +877,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -894,7 +894,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -923,7 +923,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan" ], "infra_step": true, "name": "makedirs perf_dir" @@ -933,30 +933,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -990,7 +990,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json index c36078f6be..09b8e59934 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -705,7 +705,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Disabling CPU 0", @@ -757,7 +757,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Disabling CPU 1", @@ -800,7 +800,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -808,7 +808,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -828,7 +828,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -845,7 +845,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -861,7 +861,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -878,7 +878,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -907,7 +907,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench" ], "infra_step": true, "name": "makedirs perf_dir" @@ -917,30 +917,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -974,7 +974,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json index 8c643f16a0..0be8a5a1cf 100644 --- a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromeos ip", @@ -39,7 +39,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -63,7 +63,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -84,7 +84,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -105,7 +105,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -173,7 +173,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -195,7 +195,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -216,7 +216,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -237,7 +237,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -325,7 +325,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -347,7 +347,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -368,7 +368,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -389,7 +389,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -477,7 +477,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -499,7 +499,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -520,7 +520,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -541,7 +541,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -602,7 +602,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/perf" @@ -623,7 +623,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/perf" @@ -664,13 +664,13 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rmtree data" @@ -685,13 +685,13 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "makedirs data" @@ -701,17 +701,17 @@ "python", "-u", "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "foo@127.0.0.1:/home/chronos/user/bin/nanobench" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "scp [START_DIR]/build/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench", + "name": "scp [START_DIR]/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", @@ -738,7 +738,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "chmod nanobench" @@ -817,7 +817,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "nanobench" @@ -832,7 +832,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" @@ -843,10 +843,10 @@ "-u", "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", "foo@127.0.0.1:/home/chronos/user/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" ], "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data", + "name": "scp -r foo@127.0.0.1:/home/chronos/user/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json index b21620d654..515a447e9d 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,7 +262,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -299,7 +299,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -307,7 +307,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -345,7 +345,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -365,7 +365,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Delete executables" @@ -380,7 +380,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect" @@ -395,7 +395,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -405,13 +405,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -444,7 +444,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect (2)" @@ -459,7 +459,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index a5465fb680..fba5ed165f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,7 +262,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -280,7 +280,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/perf" @@ -298,7 +298,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/perf" @@ -335,7 +335,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -343,7 +343,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -403,7 +403,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -417,7 +417,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" @@ -427,17 +427,17 @@ "adb", "pull", "/cache/skia/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /cache/skia/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data" + "name": "pull /cache/skia/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data" }, { "cmd": [ @@ -455,7 +455,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Delete executables" @@ -470,7 +470,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect" @@ -485,7 +485,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -495,13 +495,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -534,7 +534,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect (2)" @@ -549,7 +549,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index 3abcea436b..e64ba59693 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -167,7 +167,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json index 47c33137d1..89eb04af18 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All/data" ], "infra_step": true, "name": "makedirs data" @@ -146,7 +146,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -187,7 +187,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -214,7 +214,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized nanobench" }, @@ -228,7 +228,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json index afe79a521e..545fb95bae 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All/data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -181,7 +181,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -221,7 +221,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json index 72fbeca0fa..474a8d7dcb 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -181,7 +181,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -209,7 +209,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -223,7 +223,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json index 9c6e37c498..1a56a207c2 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All/data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -208,7 +208,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -222,7 +222,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json index 5aa336c6c5..5715d538a1 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json @@ -118,7 +118,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -175,7 +175,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index 59501e2e30..d2ca6a84ce 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -118,7 +118,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -165,7 +165,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json index 0f608fdd59..f02babe521 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" ], "infra_step": true, "name": "makedirs data" @@ -146,7 +146,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -189,7 +189,7 @@ "~inc1.webp", "--verbose", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -218,7 +218,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json" }, "name": "symbolized nanobench" @@ -233,7 +233,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 7f6e2cc7fa..c5d3771c39 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -172,7 +172,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index 0cdf09b2d1..9eaf7c5ad7 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json index 76ee61b5a1..052e594c05 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -210,7 +210,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, @@ -224,7 +224,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json index db034f4826..d23b32267f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -210,7 +210,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, @@ -224,7 +224,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json index 87700c3dd0..98f4096e1a 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -210,7 +210,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, @@ -224,7 +224,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json index cb2e851e94..f1cc4c2ad4 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -200,7 +200,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\\data\\nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -228,7 +228,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, @@ -242,7 +242,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json index 9131681e60..17eb0345cd 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -210,7 +210,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, @@ -224,7 +224,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json index 919bdd8fdb..a0d76c2419 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json @@ -113,7 +113,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\nanobench", + "[START_DIR]\\out\\Debug_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -158,7 +158,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json index 34d501c0e5..d6639a6ea7 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\\data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\\data" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\\data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\\data\\nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All\\data\\nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -208,7 +208,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "nanobench" }, @@ -222,7 +222,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]\\[SWARM_OUT_DIR]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json index 7ca0fdde07..33e0300528 100644 --- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json @@ -9,7 +9,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "setup_device" @@ -18,7 +18,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/out/Release/dm.app" + "[START_DIR]/out/Release/dm.app" ], "env": { "BUILDTYPE": "Release", @@ -26,7 +26,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "install_dm" @@ -35,7 +35,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/out/Release/nanobench.app" + "[START_DIR]/out/Release/nanobench.app" ], "env": { "BUILDTYPE": "Release", @@ -43,7 +43,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "install_nanobench" @@ -60,7 +60,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -112,7 +112,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -129,7 +129,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -145,7 +145,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm skps" @@ -161,7 +161,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir skps" @@ -178,7 +178,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -195,7 +195,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -247,7 +247,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -264,7 +264,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -280,7 +280,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm images" @@ -296,7 +296,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir images" @@ -313,7 +313,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -330,7 +330,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -382,7 +382,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -399,7 +399,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -415,7 +415,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm svgs" @@ -431,7 +431,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir svgs" @@ -448,7 +448,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -465,7 +465,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" @@ -481,7 +481,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm perf" @@ -497,7 +497,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir perf" @@ -620,7 +620,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -634,7 +634,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All" ], "env": { "IOS_BUNDLE_ID": "com.google.nanobench", @@ -647,7 +647,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All/data" ], "env": { "BUILDTYPE": "Release", @@ -655,7 +655,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "pull_if_needed perf" diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed.json b/infra/bots/recipes/perf.expected/cpu_scale_failed.json index 808a10ffd5..ce20c58649 100644 --- a/infra/bots/recipes/perf.expected/cpu_scale_failed.json +++ b/infra/bots/recipes/perf.expected/cpu_scale_failed.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -549,7 +549,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -593,7 +593,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -671,7 +671,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 2)", @@ -749,7 +749,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 3)", @@ -819,13 +819,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -873,7 +873,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json b/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json index 2097878ef7..15a0e9b277 100644 --- a/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json +++ b/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -521,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -539,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -585,7 +585,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 4's governor to userspace", @@ -629,7 +629,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000", @@ -707,7 +707,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000 (attempt 2)", @@ -785,7 +785,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000 (attempt 3)", @@ -860,7 +860,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android" ], "infra_step": true, "name": "makedirs perf_dir" @@ -870,30 +870,30 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" + "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -941,7 +941,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json b/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json index 50b0d32e72..57f65033c3 100644 --- a/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json +++ b/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,7 +503,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -549,7 +549,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -593,7 +593,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -671,7 +671,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 2)", @@ -747,7 +747,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -791,7 +791,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -858,7 +858,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -866,7 +866,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench" @@ -886,7 +886,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write nanobench.sh" @@ -903,7 +903,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push nanobench.sh" @@ -919,7 +919,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -936,7 +936,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench", "~followup_annotations": [ @@ -960,13 +960,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1000,7 +1000,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/failed_push.json b/infra/bots/recipes/perf.expected/failed_push.json index fe5c74293e..72db5a199f 100644 --- a/infra/bots/recipes/perf.expected/failed_push.json +++ b/infra/bots/recipes/perf.expected/failed_push.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -59,13 +59,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -127,7 +127,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json index 5e0a4586ff..2b80d97331 100644 --- a/infra/bots/recipes/perf.expected/trybot.json +++ b/infra/bots/recipes/perf.expected/trybot.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data" ], "infra_step": true, "name": "makedirs data" @@ -141,7 +141,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release_x64/nanobench", + "[START_DIR]/out/Release_x64/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", @@ -182,7 +182,7 @@ "~inc0.webp", "~inc1.webp", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data/nanobench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -214,7 +214,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -228,7 +228,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index f3cad6b81d..de8898c36e 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -192,9 +192,8 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gclient runhooks" }, @@ -226,7 +225,7 @@ "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "GN" }, @@ -242,7 +241,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Build Chrome" }, @@ -290,7 +289,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Recreate SKPs" }, diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index c1af6356de..f03b149abe 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -192,9 +192,8 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gclient runhooks" }, @@ -226,7 +225,7 @@ "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "GN" }, @@ -242,7 +241,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Build Chrome" }, @@ -277,7 +276,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Recreate SKPs" }, @@ -292,7 +291,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -307,7 +306,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -325,7 +324,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, @@ -355,7 +354,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Upload SKPs" }, diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index ace10c00f1..c449898a0f 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -192,9 +192,8 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", - "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "gclient runhooks" }, @@ -226,7 +225,7 @@ "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "GN" }, @@ -242,7 +241,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Build Chrome" }, @@ -290,7 +289,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Recreate SKPs" }, @@ -305,7 +304,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "go version" }, @@ -320,7 +319,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "env go version" }, @@ -338,7 +337,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "update go pkgs" }, @@ -368,7 +367,7 @@ "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Upload SKPs", "~followup_annotations": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json index 41780c0cb8..f8ded97cd8 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json @@ -27,7 +27,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -72,7 +72,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -91,7 +91,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -109,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -127,7 +127,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -144,7 +144,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -179,7 +179,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -188,7 +188,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -196,7 +196,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push skpbench" @@ -211,7 +211,7 @@ "--adb_binary", "adb.1.0.35", "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--config", "gles", "-v5", @@ -225,7 +225,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "skpbench" }, @@ -267,7 +267,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data" ], "infra_step": true, "name": "makedirs perf_dir" @@ -277,7 +277,7 @@ "python", "-u", "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", "abc123", @@ -286,7 +286,7 @@ "swarming_task_id", "123456", "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data/skpbench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data/skpbench_abc123_1337000001.json", "--key", "arch", "arm64", @@ -309,7 +309,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Parse skpbench output into Perf json" }, @@ -318,13 +318,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -358,7 +358,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json index 8b789b6ede..6547424769 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json @@ -27,7 +27,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -72,7 +72,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -91,7 +91,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -109,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -127,7 +127,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -144,7 +144,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -179,7 +179,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -188,7 +188,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -196,7 +196,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push skpbench" @@ -211,7 +211,7 @@ "--adb_binary", "adb.1.0.35", "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--config", "gles", "-v5", @@ -221,7 +221,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "skpbench" }, @@ -263,7 +263,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" ], "infra_step": true, "name": "makedirs perf_dir" @@ -273,7 +273,7 @@ "python", "-u", "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", "abc123", @@ -282,7 +282,7 @@ "swarming_task_id", "123456", "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data/skpbench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data/skpbench_abc123_1337000001.json", "--key", "arch", "arm64", @@ -305,7 +305,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Parse skpbench output into Perf json" }, @@ -314,13 +314,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -354,7 +354,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json index be2f5b89de..6f8d795cea 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json @@ -27,7 +27,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -72,7 +72,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -91,7 +91,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -109,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -127,7 +127,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -144,7 +144,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -179,7 +179,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -188,7 +188,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -196,7 +196,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push skpbench" @@ -211,7 +211,7 @@ "--adb_binary", "adb.1.0.35", "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--config", "vk", "-v5", @@ -221,7 +221,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "skpbench" }, @@ -263,7 +263,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data" ], "infra_step": true, "name": "makedirs perf_dir" @@ -273,7 +273,7 @@ "python", "-u", "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", "abc123", @@ -282,7 +282,7 @@ "swarming_task_id", "123456", "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data/skpbench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench/data/skpbench_abc123_1337000001.json", "--key", "arch", "arm64", @@ -305,7 +305,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Parse skpbench output into Perf json" }, @@ -314,13 +314,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -354,7 +354,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index 7078ce3689..13f2f98202 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -27,7 +27,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -72,7 +72,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -91,7 +91,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -109,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -127,7 +127,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -144,7 +144,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -179,7 +179,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -188,7 +188,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -196,7 +196,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push skpbench" @@ -211,7 +211,7 @@ "--adb_binary", "adb.1.0.35", "--resultsfile", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--config", "gles", "-v5", @@ -221,7 +221,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "skpbench" }, @@ -263,7 +263,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" ], "infra_step": true, "name": "makedirs perf_dir" @@ -273,7 +273,7 @@ "python", "-u", "[START_DIR]/skia/tools/skpbench/skiaperf.py", - "[START_DIR]/[SWARM_OUT_DIR]/table", + "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", "abc123", @@ -288,7 +288,7 @@ "swarming_task_id", "123456", "--outfile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data/skpbench_abc123_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data/skpbench_abc123_1337000001.json", "--key", "arch", "arm64", @@ -311,7 +311,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Parse skpbench output into Perf json" }, @@ -320,13 +320,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -360,7 +360,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json b/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json index 4508f91970..8e2ae9fedc 100644 --- a/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json +++ b/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json @@ -17,7 +17,7 @@ { "cmd": [ "catchsegv", - "[START_DIR]/build/out/devrel/run_testlab", + "[START_DIR]/out/devrel/run_testlab", "--logtostderr", "--devices", "[START_DIR]/whitelist_devices.json", @@ -29,7 +29,7 @@ "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "run firebase testlab" }, diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index d81c22af54..981e414c29 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to hotplug", @@ -729,7 +701,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -737,7 +709,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -757,7 +729,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -774,7 +746,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -790,7 +762,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -807,7 +779,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -831,30 +803,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -888,7 +860,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json index 9214093be9..fb79145fe3 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json index f53c4b336b..76fb94b7eb 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json index ebe9acfe31..a9b8132cfd 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json index 52fb6536d7..a297e6f01b 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json index 448c8f6c8a..ffe838eb14 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -729,7 +701,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -737,7 +709,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -757,7 +729,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -774,7 +746,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -790,7 +762,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -807,7 +779,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -831,30 +803,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -888,7 +860,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json index e443ce3065..507a956260 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Setting up device to run ASAN", @@ -102,7 +102,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -165,7 +165,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -184,7 +184,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -202,7 +202,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -220,7 +220,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -237,7 +237,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -272,7 +272,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -317,7 +317,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -336,7 +336,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -354,7 +354,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -372,7 +372,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -389,7 +389,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -424,7 +424,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -469,7 +469,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -488,7 +488,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -506,7 +506,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -524,7 +524,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -541,7 +541,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -576,7 +576,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -622,7 +622,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 0", @@ -674,7 +674,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 1", @@ -726,7 +726,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 2", @@ -778,7 +778,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 3", @@ -830,7 +830,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -874,7 +874,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -909,7 +909,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -917,7 +917,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -937,7 +937,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -954,7 +954,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -970,7 +970,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -987,7 +987,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -1011,13 +1011,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1051,7 +1051,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json index 7cd3f97070..97d742fc6d 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Setting up device to run ASAN", @@ -102,7 +102,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -165,7 +165,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -184,7 +184,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -202,7 +202,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -220,7 +220,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -237,7 +237,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -272,7 +272,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -317,7 +317,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -336,7 +336,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -354,7 +354,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -372,7 +372,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -389,7 +389,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -424,7 +424,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -469,7 +469,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -488,7 +488,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -506,7 +506,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -524,7 +524,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -541,7 +541,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -576,7 +576,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -622,7 +622,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 0", @@ -674,7 +674,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 1", @@ -726,7 +726,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 2", @@ -778,7 +778,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 3", @@ -830,7 +830,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -874,7 +874,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -909,7 +909,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -917,7 +917,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -937,7 +937,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -954,7 +954,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -970,7 +970,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -987,7 +987,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -1011,13 +1011,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1051,7 +1051,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json index 37e6e1fb1c..4eb186dfc4 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/opt/infra-android/tools/adb", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 0", @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 1", @@ -798,7 +770,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 2", @@ -850,7 +822,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 3", @@ -902,7 +874,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -946,7 +918,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -981,7 +953,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -989,7 +961,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -1009,7 +981,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -1026,7 +998,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -1042,7 +1014,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -1059,7 +1031,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -1083,30 +1055,30 @@ "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1140,7 +1112,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index 90dbcff05c..5c4092762c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -729,7 +701,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -737,7 +709,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -757,7 +729,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -774,7 +746,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -790,7 +762,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -807,7 +779,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -831,30 +803,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -888,7 +860,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json index 065348f6cb..e0b4ac306f 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -729,7 +701,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -737,7 +709,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -757,7 +729,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -774,7 +746,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -790,7 +762,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -807,7 +779,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -831,30 +803,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -888,7 +860,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json index 218475bade..ac7599cecb 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -738,7 +710,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -773,7 +745,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -781,7 +753,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -801,7 +773,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -818,7 +790,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -834,7 +806,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -851,7 +823,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -875,30 +847,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -932,7 +904,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index 5b4d2a978c..a577a36265 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -738,7 +710,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -773,7 +745,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -781,7 +753,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -801,7 +773,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -818,7 +790,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -834,7 +806,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -851,7 +823,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -875,30 +847,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -932,7 +904,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json index 5cc2e23a49..b7a33cb8a8 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 0", @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 1", @@ -798,7 +770,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -842,7 +814,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -877,7 +849,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -885,7 +857,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -905,7 +877,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -922,7 +894,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -938,7 +910,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -955,7 +927,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -979,30 +951,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1036,7 +1008,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json index 1ba03640a3..e4efbbd123 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 0", @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Enabling CPU 1", @@ -798,7 +770,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -842,7 +814,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -877,7 +849,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -885,7 +857,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -905,7 +877,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -922,7 +894,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -938,7 +910,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -955,7 +927,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -979,30 +951,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -1036,7 +1008,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json index 90e8f3399c..581821c4db 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromeos ip", @@ -39,7 +39,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -63,7 +63,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -84,7 +84,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -105,7 +105,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -173,7 +173,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -195,7 +195,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -216,7 +216,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -237,7 +237,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -325,7 +325,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -347,7 +347,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -368,7 +368,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -389,7 +389,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -477,7 +477,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -499,7 +499,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -520,7 +520,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -541,7 +541,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -588,34 +588,6 @@ }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", @@ -630,7 +602,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/dm_out" @@ -651,7 +623,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/dm_out" @@ -682,7 +654,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -776,13 +748,13 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rmtree dm" @@ -797,13 +769,13 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "makedirs dm" @@ -813,17 +785,17 @@ "python", "-u", "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", + "name": "scp [START_DIR]/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", @@ -850,7 +822,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "chmod dm" @@ -1021,7 +993,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dm" @@ -1032,10 +1004,10 @@ "-u", "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", "foo@127.0.0.1:/home/chronos/user/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", + "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json index 4407e52f3b..681c8cece1 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromeos ip", @@ -39,7 +39,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -63,7 +63,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -84,7 +84,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -105,7 +105,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -173,7 +173,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -195,7 +195,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -216,7 +216,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -237,7 +237,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -325,7 +325,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -347,7 +347,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -368,7 +368,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -389,7 +389,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -477,7 +477,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -499,7 +499,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -520,7 +520,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -541,7 +541,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -588,34 +588,6 @@ }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "ssh", "-oConnectTimeout=15", "-oBatchMode=yes", @@ -630,7 +602,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /home/chronos/user/dm_out" @@ -651,7 +623,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /home/chronos/user/dm_out" @@ -682,7 +654,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -776,13 +748,13 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rmtree dm" @@ -797,13 +769,13 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "makedirs dm" @@ -813,17 +785,17 @@ "python", "-u", "\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", + "name": "scp [START_DIR]/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", @@ -850,7 +822,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "chmod dm" @@ -1023,7 +995,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dm" @@ -1034,10 +1006,10 @@ "-u", "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)\n", "foo@127.0.0.1:/home/chronos/user/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "infra_step": true, - "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", + "name": "scp -r foo@127.0.0.1:/home/chronos/user/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 175b294b2f..08af82c5be 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,41 +262,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "adb", "shell", "rm", @@ -308,7 +280,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -326,7 +298,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -357,7 +329,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -407,7 +379,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -444,7 +416,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -452,7 +424,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -538,7 +510,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, @@ -547,17 +519,17 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /dev/shm/skia/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ @@ -575,7 +547,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Delete executables" @@ -590,7 +562,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect" @@ -605,7 +577,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -615,13 +587,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -654,7 +626,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect (2)" @@ -669,7 +641,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 376277abdf..1fbe113a1e 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,41 +262,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "adb", "shell", "rm", @@ -308,7 +280,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -326,7 +298,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -357,7 +329,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -407,7 +379,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -444,7 +416,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -452,7 +424,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -645,7 +617,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, @@ -654,17 +626,17 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /dev/shm/skia/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ @@ -682,7 +654,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Delete executables" @@ -697,7 +669,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect" @@ -712,7 +684,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -722,13 +694,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -761,7 +733,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "disconnect (2)" @@ -776,7 +748,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index 2eb8dc731a..fe9db8637c 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -431,7 +431,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json index 96c90fe23e..42b443687f 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -426,7 +426,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan:[START_DIR]/clang_linux/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index fe97a1a059..adcdfe057f 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -253,7 +225,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -522,7 +494,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json index 0e57f1262a..9cce7f83ae 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json @@ -118,7 +118,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -427,9 +427,9 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/shard_00_10.profraw", + "LLVM_PROFILE_FILE": "[CUSTOM_[SWARM_OUT_DIR]]/shard_00_10.profraw", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json index abd76af9ed..7a9c421f5d 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -253,7 +225,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -273,7 +245,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json index 3d70ca33b2..4208c385d3 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json @@ -117,7 +117,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -428,7 +428,7 @@ "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "TSAN_OPTIONS": "report_signal_unsafe=0" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json index f31df450ec..2e6c70426f 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -251,7 +223,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -520,7 +492,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json index b5f36cadaa..fbe89d5f91 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -251,7 +223,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -518,7 +490,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json index 308f3e18bb..fd7763fcae 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -246,7 +218,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -491,7 +463,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json index bd437a9855..aea20f5fe0 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -484,7 +456,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json index 7c8d188f65..ee732d7022 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -246,7 +218,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -492,7 +464,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json index 74c6bfad08..b52082542e 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -246,7 +218,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -591,7 +563,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json index 8b2d6f1b1d..53aa5371ca 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -487,7 +459,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json index f406368cb2..0066b2e2b3 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -251,7 +223,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -424,7 +396,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json index 26681ddbde..da58095bef 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -253,7 +225,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -436,7 +408,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index c99929bed2..b3c286fdad 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -253,7 +225,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -419,7 +391,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json index 4501c6940d..f592cf42bb 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -251,7 +223,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -424,7 +396,7 @@ "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json index a97dd0cd5e..011b2cd919 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -253,7 +225,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -377,7 +349,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json index 3da33f79f8..29e00b95d0 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -253,7 +225,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -380,7 +352,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json index de4a3b08ee..d746145f6b 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json @@ -118,7 +118,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -280,9 +280,9 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib", - "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/All.profraw", + "LLVM_PROFILE_FILE": "[CUSTOM_[SWARM_OUT_DIR]]/All.profraw", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 37cc8599b9..bfe64b25ad 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -295,7 +295,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 82c98d76bf..c40b966e1f 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -296,7 +296,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index 9090738b46..a2e93189dd 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -120,7 +120,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -294,7 +294,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", + "SKIA_OUT": "[START_DIR]/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json index eccd361a86..d351e05816 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -420,7 +392,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json index 851d83a48d..0ef5611a61 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -413,7 +385,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json index aea7be0377..7ec8ac3a5f 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\dm", + "[START_DIR]\\out\\Release_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -421,7 +393,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json index 166036cd7f..0114c6ab69 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -317,7 +289,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json index efcfebe74d..c8ea64d596 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -318,7 +290,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json index 886a408d30..9a304e562a 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -488,7 +460,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json index b899f4831b..a3b34b5593 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -573,7 +545,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json index 58ad83df15..ac446cc4aa 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Release_x64\\dm", + "[START_DIR]\\out\\Release_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -420,7 +392,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json index 99142fe202..247e9ec57f 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -413,7 +385,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json index b567c1cf02..f059b76480 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -418,7 +390,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json index 37f91d9d1c..f0e8a91f85 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -413,7 +385,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json index d4b728e89e..da94a89f4e 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -246,7 +218,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -419,7 +391,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json index 8e07ec9d3d..f9f7b7a663 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -332,7 +304,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json index 78f08a700f..14b27d0bff 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -331,7 +303,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json index ed4384245c..99718e760e 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -248,7 +220,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -333,7 +305,7 @@ "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json index eae5500615..abf7869754 100644 --- a/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]\\test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\out\\Debug\\dm", + "[START_DIR]\\out\\Debug\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", @@ -246,7 +218,7 @@ "--uninterestingHashesFile", "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", - "[START_DIR]\\[SWARM_OUT_DIR]\\dm", + "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -629,7 +601,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json index 58dd0e5270..a5f3d83776 100644 --- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json @@ -9,7 +9,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "setup_device" @@ -18,7 +18,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/out/Release/dm.app" + "[START_DIR]/out/Release/dm.app" ], "env": { "BUILDTYPE": "Release", @@ -26,7 +26,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "install_dm" @@ -35,7 +35,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/out/Release/nanobench.app" + "[START_DIR]/out/Release/nanobench.app" ], "env": { "BUILDTYPE": "Release", @@ -43,7 +43,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "install_nanobench" @@ -60,7 +60,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -112,7 +112,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -129,7 +129,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -145,7 +145,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm skps" @@ -161,7 +161,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir skps" @@ -178,7 +178,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -195,7 +195,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -247,7 +247,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -264,7 +264,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -280,7 +280,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm images" @@ -296,7 +296,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir images" @@ -313,7 +313,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -330,7 +330,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -382,7 +382,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -399,7 +399,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -415,7 +415,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm svgs" @@ -431,7 +431,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir svgs" @@ -448,7 +448,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -465,49 +465,13 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "env": { - "IOS_BUNDLE_ID": "com.google.dm", - "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice" - }, - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "env": { - "IOS_BUNDLE_ID": "com.google.dm", - "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice" - }, - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "dm" ], @@ -517,7 +481,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm dm" @@ -533,7 +497,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir dm" @@ -570,7 +534,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -620,7 +584,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt" @@ -950,7 +914,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, @@ -958,7 +922,7 @@ "cmd": [ "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "dm", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Release", @@ -966,7 +930,7 @@ "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "pull_if_needed dm" diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 3d0a9bd4e9..9e990eac44 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -210,7 +182,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -251,7 +223,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -518,7 +490,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "symbolized dm", "~followup_annotations": [ diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index 5ca47e0dd0..ec91a614bd 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -650,7 +622,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -696,7 +668,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -731,7 +703,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -739,7 +711,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -759,7 +731,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -776,7 +748,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -792,7 +764,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -809,7 +781,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -833,30 +805,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Release" + "[START_DIR]/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -890,7 +862,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index 4c43bb9b32..456901e7b0 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -694,7 +666,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -729,7 +701,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -737,7 +709,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -757,7 +729,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -774,7 +746,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -790,7 +762,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -807,7 +779,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -833,17 +805,17 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm", "~followup_annotations": [ "step returned non-zero exit code: 1", "@@@STEP_EXCEPTION@@@" @@ -854,13 +826,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -894,14 +866,14 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" }, { "name": "$result", - "reason": "Infra Failure: Step('pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm') returned 1", + "reason": "Infra Failure: Step('pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm') returned 1", "recipe_result": null, "status_code": 1 } diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json index 179a2a4d72..756ad2265a 100644 --- a/infra/bots/recipes/test.expected/failed_push.json +++ b/infra/bots/recipes/test.expected/failed_push.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -59,13 +59,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -127,7 +127,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json index 3594b68ce8..6e17a58b33 100644 --- a/infra/bots/recipes/test.expected/internal_bot_1.json +++ b/infra/bots/recipes/test.expected/internal_bot_1.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json index 250cb72083..6039b53a14 100644 --- a/infra/bots/recipes/test.expected/internal_bot_2.json +++ b/infra/bots/recipes/test.expected/internal_bot_2.json @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,41 +503,13 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ "/usr/bin/adb.1.0.35", "shell", "rm", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index 1b5de9bea7..be4e65c04b 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -90,34 +90,6 @@ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", "ensure-directory", "--mode", "0777", @@ -137,7 +109,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -205,7 +177,7 @@ }, { "cmd": [ - "[START_DIR]/build/out/Release_x64/dm", + "[START_DIR]/out/Release_x64/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -252,7 +224,7 @@ "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]/dm", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--dont_write", "pdf", "--randomProcessorTest", @@ -578,7 +550,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index ad2dd257a3..9634a0c51f 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -793,7 +793,6 @@ def test_steps(api): use_hash_file = False if api.vars.upload_dm_results: host_dm_dir = str(api.vars.dm_dir) - api.flavor.create_clean_host_dir(api.vars.test_dir) device_dm_dir = str(api.flavor.device_dirs.dm_dir) if host_dm_dir != device_dm_dir: api.flavor.create_clean_device_dir(device_dm_dir) @@ -1160,7 +1159,7 @@ def GenTests(api): ) + api.step_data('dm', retcode=1) + api.step_data('pull /sdcard/revenge_of_the_skiabot/dm_out '+ - '[START_DIR]/[SWARM_OUT_DIR]/dm', retcode=1) + '[CUSTOM_[SWARM_OUT_DIR]]/dm', retcode=1) ) yield ( diff --git a/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json b/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json index faa4509494..f5b96d54d2 100644 --- a/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json +++ b/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json @@ -150,7 +150,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Update meta/config" }, diff --git a/infra/bots/recipes/update_meta_config.expected/failed_update.json b/infra/bots/recipes/update_meta_config.expected/failed_update.json index 30c60b7a5f..c3580e3395 100644 --- a/infra/bots/recipes/update_meta_config.expected/failed_update.json +++ b/infra/bots/recipes/update_meta_config.expected/failed_update.json @@ -150,7 +150,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "Update meta/config", "~followup_annotations": [ diff --git a/infra/bots/recipes/upload_coverage_results.expected/alternate_bucket.json b/infra/bots/recipes/upload_coverage_results.expected/alternate_bucket.json index c9bc60bc4d..3e2bbfed52 100644 --- a/infra/bots/recipes/upload_coverage_results.expected/alternate_bucket.json +++ b/infra/bots/recipes/upload_coverage_results.expected/alternate_bucket.json @@ -7,16 +7,16 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/coverage", + "[START_DIR]", "*.profraw" ], "infra_step": true, "name": "find raw inputs", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/a.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/b.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/c.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/a.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/b.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/c.raw@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,9 +25,9 @@ "tar", "-zcvf", "[START_DIR]/raw_data.profraw.tar.gz", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "create raw data archive" }, @@ -47,9 +47,9 @@ "-sparse", "-o", "[START_DIR]/output.profdata", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "merge and index" }, @@ -67,7 +67,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=0", "-format=text", @@ -108,7 +108,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=1", "-format=html", diff --git a/infra/bots/recipes/upload_coverage_results.expected/failed_all.json b/infra/bots/recipes/upload_coverage_results.expected/failed_all.json index f8c48930ba..96be589d3b 100644 --- a/infra/bots/recipes/upload_coverage_results.expected/failed_all.json +++ b/infra/bots/recipes/upload_coverage_results.expected/failed_all.json @@ -7,16 +7,16 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/coverage", + "[START_DIR]", "*.profraw" ], "infra_step": true, "name": "find raw inputs", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/a.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/b.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/c.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/a.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/b.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/c.raw@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,9 +25,9 @@ "tar", "-zcvf", "[START_DIR]/raw_data.profraw.tar.gz", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "create raw data archive" }, @@ -47,9 +47,9 @@ "-sparse", "-o", "[START_DIR]/output.profdata", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "merge and index" }, diff --git a/infra/bots/recipes/upload_coverage_results.expected/failed_once.json b/infra/bots/recipes/upload_coverage_results.expected/failed_once.json index 51eda3bbe0..a0dc0bf034 100644 --- a/infra/bots/recipes/upload_coverage_results.expected/failed_once.json +++ b/infra/bots/recipes/upload_coverage_results.expected/failed_once.json @@ -7,16 +7,16 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/coverage", + "[START_DIR]", "*.profraw" ], "infra_step": true, "name": "find raw inputs", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/a.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/b.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/c.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/a.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/b.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/c.raw@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,9 +25,9 @@ "tar", "-zcvf", "[START_DIR]/raw_data.profraw.tar.gz", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "create raw data archive" }, @@ -47,9 +47,9 @@ "-sparse", "-o", "[START_DIR]/output.profdata", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "merge and index" }, @@ -81,7 +81,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=0", "-format=text", @@ -122,7 +122,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=1", "-format=html", diff --git a/infra/bots/recipes/upload_coverage_results.expected/normal_bot.json b/infra/bots/recipes/upload_coverage_results.expected/normal_bot.json index c786245fe2..ced66fbe6f 100644 --- a/infra/bots/recipes/upload_coverage_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_coverage_results.expected/normal_bot.json @@ -7,16 +7,16 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/coverage", + "[START_DIR]", "*.profraw" ], "infra_step": true, "name": "find raw inputs", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/a.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/b.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/c.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/a.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/b.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/c.raw@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,9 +25,9 @@ "tar", "-zcvf", "[START_DIR]/raw_data.profraw.tar.gz", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "create raw data archive" }, @@ -47,9 +47,9 @@ "-sparse", "-o", "[START_DIR]/output.profdata", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "merge and index" }, @@ -67,7 +67,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=0", "-format=text", @@ -108,7 +108,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=1", "-format=html", diff --git a/infra/bots/recipes/upload_coverage_results.expected/trybot.json b/infra/bots/recipes/upload_coverage_results.expected/trybot.json index 9bc638c06a..938b3280b4 100644 --- a/infra/bots/recipes/upload_coverage_results.expected/trybot.json +++ b/infra/bots/recipes/upload_coverage_results.expected/trybot.json @@ -7,16 +7,16 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/coverage", + "[START_DIR]", "*.profraw" ], "infra_step": true, "name": "find raw inputs", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/a.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/b.raw@@@", - "@@@STEP_LOG_LINE@glob@[START_DIR]/coverage/c.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/a.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/b.raw@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/c.raw@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,9 +25,9 @@ "tar", "-zcvf", "[START_DIR]/raw_data.profraw.tar.gz", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "create raw data archive" }, @@ -47,9 +47,9 @@ "-sparse", "-o", "[START_DIR]/output.profdata", - "[START_DIR]/coverage/a.raw", - "[START_DIR]/coverage/b.raw", - "[START_DIR]/coverage/c.raw" + "[START_DIR]/a.raw", + "[START_DIR]/b.raw", + "[START_DIR]/c.raw" ], "name": "merge and index" }, @@ -67,7 +67,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=0", "-format=text", @@ -108,7 +108,7 @@ "cmd": [ "[START_DIR]/clang_linux/bin/llvm-cov", "show", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "-instr-profile=[START_DIR]/output.profdata", "-use-color=1", "-format=html", diff --git a/infra/bots/recipes/upload_coverage_results.py b/infra/bots/recipes/upload_coverage_results.py index 6df7c6e11f..91fa79c2dd 100644 --- a/infra/bots/recipes/upload_coverage_results.py +++ b/infra/bots/recipes/upload_coverage_results.py @@ -48,13 +48,13 @@ def RunSteps(api): # The raw data files are brought in as isolated inputs. It is possible # for there to be 1 if the coverage task wasn't broken up. - raw_inputs = api.file.glob_paths( - 'find raw inputs', api.path['start_dir'].join('coverage'), - RAW_FILE, test_data=['a.raw', 'b.raw', 'c.raw']) + raw_inputs = api.file.glob_paths('find raw inputs', api.path['start_dir'], + RAW_FILE, + test_data=['a.raw', 'b.raw', 'c.raw']) # The instrumented executable is brought in as an isolated input. - executable = api.path['start_dir'].join('build', 'out','Debug','dm') + executable = api.path['start_dir'].join('out','Debug','dm') # clang_dir is brought in via CIPD. clang_dir = api.path['start_dir'].join('clang_linux', 'bin') diff --git a/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json b/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json index e30dfc2d25..fca5954dd0 100644 --- a/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json +++ b/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json @@ -22,7 +22,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/dm.json", + "[START_DIR]/dm/dm.json", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -36,7 +36,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/verbose.log", + "[START_DIR]/dm/verbose.log", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -50,7 +50,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "infra_step": true, "name": "rm old dm.json" @@ -63,7 +63,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "infra_step": true, "name": "rm old verbose.log" @@ -76,14 +76,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.png" ], "infra_step": true, "name": "find images", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -92,7 +92,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" @@ -105,14 +105,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.pdf" ], "infra_step": true, "name": "find images (2)", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_all.json b/infra/bots/recipes/upload_dm_results.expected/failed_all.json index 2058e5bbe8..3d643abb6f 100644 --- a/infra/bots/recipes/upload_dm_results.expected/failed_all.json +++ b/infra/bots/recipes/upload_dm_results.expected/failed_all.json @@ -22,7 +22,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/dm.json", + "[START_DIR]/dm/dm.json", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -36,7 +36,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/verbose.log", + "[START_DIR]/dm/verbose.log", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -50,7 +50,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "infra_step": true, "name": "rm old dm.json" @@ -63,7 +63,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "infra_step": true, "name": "rm old verbose.log" @@ -76,14 +76,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.png" ], "infra_step": true, "name": "find images", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -92,7 +92,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images", @@ -106,7 +106,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 2)", @@ -120,7 +120,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 3)", @@ -134,7 +134,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 4)", @@ -148,7 +148,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 5)", diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_once.json b/infra/bots/recipes/upload_dm_results.expected/failed_once.json index 596ec3bdde..c2531d9e24 100644 --- a/infra/bots/recipes/upload_dm_results.expected/failed_once.json +++ b/infra/bots/recipes/upload_dm_results.expected/failed_once.json @@ -22,7 +22,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/dm.json", + "[START_DIR]/dm/dm.json", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -36,7 +36,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/verbose.log", + "[START_DIR]/dm/verbose.log", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -50,7 +50,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "infra_step": true, "name": "rm old dm.json" @@ -63,7 +63,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "infra_step": true, "name": "rm old verbose.log" @@ -76,14 +76,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.png" ], "infra_step": true, "name": "find images", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -92,7 +92,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images", @@ -106,7 +106,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 2)" @@ -119,14 +119,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.pdf" ], "infra_step": true, "name": "find images (2)", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, diff --git a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json index 44dfb7beac..4a8fd11bf4 100644 --- a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json @@ -22,7 +22,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/dm.json", + "[START_DIR]/dm/dm.json", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -36,7 +36,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/verbose.log", + "[START_DIR]/dm/verbose.log", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -50,7 +50,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "infra_step": true, "name": "rm old dm.json" @@ -63,7 +63,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "infra_step": true, "name": "rm old verbose.log" @@ -76,14 +76,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.png" ], "infra_step": true, "name": "find images", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -92,7 +92,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" @@ -105,14 +105,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.pdf" ], "infra_step": true, "name": "find images (2)", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, diff --git a/infra/bots/recipes/upload_dm_results.expected/trybot.json b/infra/bots/recipes/upload_dm_results.expected/trybot.json index 405da7af13..5a10528d1d 100644 --- a/infra/bots/recipes/upload_dm_results.expected/trybot.json +++ b/infra/bots/recipes/upload_dm_results.expected/trybot.json @@ -22,7 +22,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/dm.json", + "[START_DIR]/dm/dm.json", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -36,7 +36,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/test/dm/verbose.log", + "[START_DIR]/dm/verbose.log", "[START_DIR]/tmp_upload" ], "infra_step": true, @@ -50,7 +50,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "infra_step": true, "name": "rm old dm.json" @@ -63,7 +63,7 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/test/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "infra_step": true, "name": "rm old verbose.log" @@ -76,14 +76,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.png" ], "infra_step": true, "name": "find images", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -92,7 +92,7 @@ "gsutil", "-m", "cp", - "[START_DIR]/test/dm/*.png", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" @@ -105,14 +105,14 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/test/dm", + "[START_DIR]/dm", "*.pdf" ], "infra_step": true, "name": "find images (2)", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/test/dm/someimage.png@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", "@@@STEP_LOG_END@glob@@@" ] }, diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index 24813a7a36..7d08089a1d 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -29,7 +29,7 @@ def RunSteps(api): builder_name = api.properties['buildername'] revision = api.properties['revision'] - results_dir = api.path['start_dir'].join('test', 'dm') + results_dir = api.path['start_dir'].join('dm') # Move dm.json and verbose.log to their own directory. json_file = results_dir.join(DM_JSON) diff --git a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json index 16f05993e1..37e6233443 100644 --- a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json @@ -7,15 +7,15 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", + "[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", "*.json" ], - "cwd": "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", + "cwd": "[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", "infra_step": true, "name": "find results", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,7 +25,7 @@ "cp", "-z", "json", - "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json", + "[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json", "gs://skia-perf/nano-json-v1/2012/05/14/12/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/nanobench_abc123.json" ], "infra_step": true, diff --git a/infra/bots/recipes/upload_nano_results.expected/trybot.json b/infra/bots/recipes/upload_nano_results.expected/trybot.json index 037e8c7cfb..e8434203a2 100644 --- a/infra/bots/recipes/upload_nano_results.expected/trybot.json +++ b/infra/bots/recipes/upload_nano_results.expected/trybot.json @@ -7,15 +7,15 @@ "--json-output", "/path/to/tmp/json", "glob", - "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", + "[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", "*.json" ], - "cwd": "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", + "cwd": "[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data", "infra_step": true, "name": "find results", "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@glob@[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json@@@", + "@@@STEP_LOG_LINE@glob@[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json@@@", "@@@STEP_LOG_END@glob@@@" ] }, @@ -25,7 +25,7 @@ "cp", "-z", "json", - "[START_DIR]/perf/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json", + "[START_DIR]/perfdata/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/data/nanobench_abc123.json", "gs://skia-perf/trybot/nano-json-v1/2012/05/14/12/Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-All-Debug/456789/12/nanobench_abc123.json" ], "infra_step": true, diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py index 652e31b586..ce2c8aa404 100644 --- a/infra/bots/recipes/upload_nano_results.py +++ b/infra/bots/recipes/upload_nano_results.py @@ -22,7 +22,7 @@ def RunSteps(api): now = api.time.utcnow() src_path = api.path['start_dir'].join( - 'perf', 'perfdata', builder_name, 'data') + 'perfdata', builder_name, 'data') with api.context(cwd=src_path): results = api.file.glob_paths( 'find results', diff --git a/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json b/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json index 77d285f1a2..10e2745965 100644 --- a/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json +++ b/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json @@ -3,7 +3,7 @@ "cmd": [ "gsutil", "cp", - "[START_DIR]/build/out/Release/skiaserve", + "[START_DIR]/out/Release/skiaserve", "gs://skia-public-binaries/skiaserve/arm/abc123/" ], "name": "upload skiaserve" diff --git a/infra/bots/recipes/upload_skiaserve.py b/infra/bots/recipes/upload_skiaserve.py index cee9584c77..6e1f61b2c4 100644 --- a/infra/bots/recipes/upload_skiaserve.py +++ b/infra/bots/recipes/upload_skiaserve.py @@ -27,7 +27,7 @@ def RunSteps(api): # Do not upload skiaserve for trybots. return - src = api.vars.build_dir.join('out', api.vars.configuration, 'skiaserve') + src = api.path['start_dir'].join('out', api.vars.configuration, 'skiaserve') target_arch = api.vars.builder_cfg.get('target_arch') dest = 'gs://skia-public-binaries/skiaserve/%s/%s/' % ( target_arch, api.properties['revision']) |