diff options
| author |  Eric Boren <borenet@google.com> | 2018-06-01 11:53:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 11:53:46 +0000 |
| commit | fbe7166685b860a530ebe545aef5596c6a86c403 (patch) | |
| tree | 794a46b6d3b643ccdbac3d719155dedb38101cd0 /infra/bots/recipes | |
| parent | 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b (diff) | |
Revert "[recipes] Isolate build outputs with no subdirs"
This reverts commit 0c9d2805e81e15e3afdf7ebcdc030771dbe7750b.
Reason for revert: Broke iOS and SwiftShader (and maybe others)
Original change's description:
> [recipes] Isolate build outputs with no subdirs
>
> Bug: skia:6473
> Change-Id: If243b6afb748529d2bdb212e360cd4338edc929c
> Reviewed-on: https://skia-review.googlesource.com/130942
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
TBR=borenet@google.com,benjaminwagner@google.com
Change-Id: Icf9490f2f88dc454c6d971f35258e219137b0c0e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6473
Reviewed-on: https://skia-review.googlesource.com/131400
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes')
99 files changed, 139 insertions, 136 deletions
diff --git a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json index eab25b19d4..b4f9ceb301 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -210,7 +210,7 @@ "python", "[START_DIR]/cache/work/skia/infra/bots/upload_md.py", "--bookmaker_binary", - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "--fiddlecli_output", "[START_DIR]/fiddleout.json" ], 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 3770625bf9..ee67b33dc8 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-e", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json index ee8b03f642..f67a4ccae8 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-e", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json index 3c10c149cc..9bd1344802 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-e", diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json index f18de36b61..4f6395d246 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-e", @@ -176,7 +176,7 @@ "python", "[START_DIR]/cache/work/skia/infra/bots/upload_md.py", "--bookmaker_binary", - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "--fiddlecli_output", "[START_DIR]/fiddleout.json" ], diff --git a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json index 6c9075aea9..6dae896929 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-x" diff --git a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json index 8c526f822f..60f111d728 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json @@ -137,7 +137,7 @@ }, { "cmd": [ - "[START_DIR]/build/bookmaker", + "[START_DIR]/build/out/Release/bookmaker", "-a", "docs/status.json", "-x" diff --git a/infra/bots/recipes/bookmaker.py b/infra/bots/recipes/bookmaker.py index 78b8846c3a..3a568ec9bf 100644 --- a/infra/bots/recipes/bookmaker.py +++ b/infra/bots/recipes/bookmaker.py @@ -46,7 +46,7 @@ def RunSteps(api): skia_dir = checkout_root.join('skia') with api.context(cwd=skia_dir, env=api.infra.go_env): - bookmaker_binary = api.vars.build_dir.join('bookmaker') + bookmaker_binary = api.vars.skia_out.join('bookmaker') buildername = api.vars.builder_name if 'PerCommit' in buildername: 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 129a08b2c3..8a4e97b4d3 100644 --- a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json @@ -92,8 +92,8 @@ "[START_DIR]/[SWARM_OUT_DIR]", "modified", "master", - "[START_DIR]/build/nanobench", - "[START_DIR]/build/ParentRevision/nanobench", + "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/build/ParentRevision/out/Release/nanobench", "--svgs [START_DIR]/svg --skps [START_DIR]/skp --mpd false", "--svgs [START_DIR]/svg --skps [START_DIR]/skp --mpd false", "2", diff --git a/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json b/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json index 6ae245e0ec..c53880ba1a 100644 --- a/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json +++ b/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json @@ -92,8 +92,8 @@ "[START_DIR]/[SWARM_OUT_DIR]", "modified", "master", - "[START_DIR]/build/nanobench", - "[START_DIR]/build/ParentRevision/nanobench", + "[START_DIR]/build/out/Release/nanobench", + "[START_DIR]/build/ParentRevision/out/Release/nanobench", "--svgs [START_DIR]/svg --skps [START_DIR]/skp", "--svgs [START_DIR]/svg --skps [START_DIR]/skp", "2", diff --git a/infra/bots/recipes/calmbench.py b/infra/bots/recipes/calmbench.py index c96a082ea5..659b3a4f02 100644 --- a/infra/bots/recipes/calmbench.py +++ b/infra/bots/recipes/calmbench.py @@ -44,8 +44,9 @@ def RunSteps(api): skia_dir.join('tools', 'calmbench', 'ab.py'), api.vars.swarming_out_dir, 'modified', 'master', - api.vars.build_dir.join('nanobench'), - api.vars.build_dir.join('ParentRevision', 'nanobench'), + api.vars.build_dir.join("out", api.vars.configuration, 'nanobench'), + api.vars.build_dir.join("ParentRevision", "out", + api.vars.configuration, 'nanobench'), extra_arg, extra_arg, 2, # reps "false", # skipbase diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json index 66c13382f6..c25b7ebd2a 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json @@ -218,7 +218,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', 'skpbench.exe', '*.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]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel", - "[START_DIR]/[SWARM_OUT_DIR]" + "[START_DIR]/[SWARM_OUT_DIR]/out/devrel" ], "infra_step": true, "name": "copy build products", @@ -259,7 +259,7 @@ "/path/to/tmp/json", "copy", "[START_DIR]/cache/work/skia/infra/cts/whitelist_devices.json", - "[START_DIR]/[SWARM_OUT_DIR]" + "[START_DIR]/[SWARM_OUT_DIR]/out/devrel" ], "infra_step": true, "name": "copy whitelist" 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 0bfe1f5a97..4a634332f1 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 @@ -142,7 +142,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', 'skpbench.exe', '*.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]" + "[START_DIR]/[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-ParentRevision.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json index bf0a8e4a0d..37b0efacbd 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json @@ -171,7 +171,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', 'skpbench.exe', '*.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]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ParentRevision/Release", - "[START_DIR]/[SWARM_OUT_DIR]/ParentRevision" + "[START_DIR]/[SWARM_OUT_DIR]/ParentRevision/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 e09a70f3cf..fb4dfcb075 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 @@ -186,7 +186,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', 'skpbench.exe', '*.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]/cache/work/flutter/src/out/android_release", - "[START_DIR]/[SWARM_OUT_DIR]" + "[START_DIR]/[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 231ef17e25..7061a2e781 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 @@ -194,7 +194,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', 'skpbench.exe', '*.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]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", - "[START_DIR]/[SWARM_OUT_DIR]" + "[START_DIR]/[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 ba33a339f7..0ee76b3302 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 @@ -171,7 +171,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', 'skpbench.exe', '*.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]/cache/work/skia/out/Build-Win-Clang-x86-Debug/Debug", - "[START_DIR]/[SWARM_OUT_DIR]" + "[START_DIR]/[SWARM_OUT_DIR]/out/Debug" ], "infra_step": true, "name": "copy build products", diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index cea7af4648..9a2e0f6b23 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -69,14 +69,16 @@ def RunSteps(api): api.build(checkout_root=checkout_root, out_dir=out_dir) # TODO(borenet): Move this out of the try/finally. - dst = api.vars.swarming_out_dir + dst = api.vars.swarming_out_dir.join('out', api.vars.configuration) if 'ParentRevision' in api.vars.builder_name: - dst = api.vars.swarming_out_dir.join('ParentRevision') + dst = api.vars.swarming_out_dir.join( + 'ParentRevision', 'out', api.vars.configuration) api.build.copy_build_products(out_dir=out_dir, dst=dst) if 'SKQP' in api.vars.extra_tokens: wlist = checkout_root.join( 'skia', 'infra','cts', 'whitelist_devices.json') api.file.copy('copy whitelist', wlist, dst) + finally: if 'Win' in api.vars.builder_cfg.get('os', ''): api.python.inline( diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index ea4e50dc90..8d7f7912fb 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -132,7 +132,7 @@ "python", "RECIPE_MODULE[skia::binary_size]/resources/run_binary_size_analysis.py", "--library", - "[START_DIR]/build/libskia.so", + "[START_DIR]/build/out/Release/libskia.so", "--githash", "abc123", "--dest", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index fb0259b373..d152ff9c82 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -140,7 +140,7 @@ "python", "RECIPE_MODULE[skia::binary_size]/resources/run_binary_size_analysis.py", "--library", - "[START_DIR]/build/libskia.so", + "[START_DIR]/build/out/Release/libskia.so", "--githash", "abc123", "--dest", 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 fc4666a750..ed0a4e7fe7 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 @@ -709,7 +709,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Debug/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -804,7 +804,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 feeef74233..c16360fb4f 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 @@ -797,7 +797,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -923,7 +923,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 eb4adb375a..d100833bdb 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 @@ -781,7 +781,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -907,7 +907,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 15630df96d..0efce55ed1 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 @@ -674,7 +674,7 @@ "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/nanobench", + "[START_DIR]/build/out/Release/nanobench", "foo@127.0.0.1:/home/chronos/user/bin/nanobench" ], "env": { @@ -682,7 +682,7 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "scp [START_DIR]/build/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench", + "name": "scp [START_DIR]/build/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@@@", 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 5f0567f087..f463cc13f8 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 @@ -292,7 +292,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Debug/nanobench", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -386,7 +386,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 03a70cf946..4a395052d9 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 @@ -324,7 +324,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -470,7 +470,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 a305a986b0..fd94a68a50 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 @@ -132,7 +132,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Debug/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json index 235a7ab264..89fbc55b99 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json @@ -133,7 +133,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Debug/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json index 7f01b9c38a..b229366d2f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json @@ -161,7 +161,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json index 47af8f18a6..2166ee450f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", 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 4ed26aa91b..c10dcc8055 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 @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", 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 84c480088e..61dbf1b5bb 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 @@ -135,7 +135,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", 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 45b9a8556b..ac4cbf444b 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 @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\nanobench", + "[START_DIR]\\build\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json index b842929297..bc3730ae9a 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\nanobench", + "[START_DIR]\\build\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", 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 9a307626a1..854a208311 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 @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\nanobench", + "[START_DIR]\\build\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", 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 443d9d0d77..720b3d72e9 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 @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\nanobench", + "[START_DIR]\\build\\out\\Release_x64\\nanobench", "-i", "[START_DIR]\\skia\\resources", "--skps", 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 a2446533ca..ca0ebfb873 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 @@ -31,7 +31,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/dm.app" + "[START_DIR]/build/out/Release/dm.app" ], "env": { "CHROME_HEADLESS": "1", @@ -46,7 +46,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/nanobench.app" + "[START_DIR]/build/out/Release/nanobench.app" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json index e26bad9c6c..f57f2244c3 100644 --- a/infra/bots/recipes/perf.expected/trybot.json +++ b/infra/bots/recipes/perf.expected/trybot.json @@ -156,7 +156,7 @@ }, { "cmd": [ - "[START_DIR]/build/nanobench", + "[START_DIR]/build/out/Release_x64/nanobench", "-i", "[START_DIR]/skia/resources", "--skps", 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 491a0a35b3..378e65fb07 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 @@ -195,7 +195,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/skpbench", + "[START_DIR]/build/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -304,7 +304,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 225854a873..784d79b2ad 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 @@ -195,7 +195,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/skpbench", + "[START_DIR]/build/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -300,7 +300,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 3d6874147a..d9ae7b6d02 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 @@ -195,7 +195,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/skpbench", + "[START_DIR]/build/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -300,7 +300,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json index e03ee5f5ff..fd89972ff0 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json @@ -62,7 +62,7 @@ "python", "-u", "[START_DIR]/skia/tools/skpbench/skpbench.py", - "[START_DIR]/build/skpbench", + "[START_DIR]/build/out/Release_x64/skpbench", "--resultsfile", "[START_DIR]/[SWARM_OUT_DIR]/table", "--config", diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index b9c6d355b1..3160cf2355 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -195,7 +195,7 @@ "cmd": [ "adb.1.0.35", "push", - "[START_DIR]/build/skpbench", + "[START_DIR]/build/out/Release/skpbench", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -306,7 +306,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/skpbench.py b/infra/bots/recipes/skpbench.py index f2e419ab30..b5e524190f 100644 --- a/infra/bots/recipes/skpbench.py +++ b/infra/bots/recipes/skpbench.py @@ -43,7 +43,7 @@ def skpbench_steps(api): 'makedirs perf_dir', api.flavor.host_dirs.perf_data_dir) if 'Android' in api.vars.builder_name: - app = api.vars.build_dir.join('skpbench') + app = api.vars.skia_out.join('skpbench') _adb(api, 'push skpbench', 'push', app, api.flavor.device_dirs.bin_dir) skpbench_dir = api.vars.slave_dir.join('skia', 'tools', 'skpbench') 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 fbb47f4f64..530fca37b9 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/run_testlab", + "[START_DIR]/build/out/devrel/run_testlab", "--logtostderr", "--devices", "[START_DIR]/whitelist_devices.json", 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 3fa3085eab..2daf7afcb5 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 @@ -698,7 +698,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -809,7 +809,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 a24732f38e..0a962ed8d3 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 @@ -656,7 +656,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -767,7 +767,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 7299de6aa8..816507e800 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 @@ -656,7 +656,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -767,7 +767,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 71d3e638d0..4830ee12ba 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 @@ -656,7 +656,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -767,7 +767,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 2fa3f3ea43..38b2a33c55 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 @@ -698,7 +698,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -809,7 +809,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 307409352d..a1adc51a90 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 @@ -902,7 +902,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -997,7 +997,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 a889ed3071..271694b581 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 @@ -940,7 +940,7 @@ "cmd": [ "/opt/infra-android/tools/adb", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -1051,7 +1051,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 8cfcdbc63f..a25b46855f 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 @@ -698,7 +698,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -809,7 +809,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 c7b15efc55..8a9825f369 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 @@ -740,7 +740,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -851,7 +851,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 7447fb5766..17404f7f00 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 @@ -840,7 +840,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -951,7 +951,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", 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 cd0bd7d603..3071a8a683 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 @@ -769,7 +769,7 @@ "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/dm", + "[START_DIR]/build/out/Debug/dm", "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { @@ -777,7 +777,7 @@ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, - "name": "scp [START_DIR]/build/dm foo@127.0.0.1:/home/chronos/user/bin/dm", + "name": "scp [START_DIR]/build/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@@@", 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 e975d38767..487fd4492d 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 @@ -414,7 +414,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -571,7 +571,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 dc1055db67..3207780cd1 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 @@ -414,7 +414,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -678,7 +678,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", 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 2e3a57a7e6..d16275ec5f 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 @@ -132,7 +132,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 88d4a45b3b..1a167a3ab5 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 @@ -132,7 +132,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 0f1934c743..208bca95e0 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 @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json index abce7e897a..95a6882e35 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 1aef121663..030f09513e 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 @@ -133,7 +133,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 274ff47fd1..4e366e7ae1 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 @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 8aa3934778..b038befb02 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 @@ -132,7 +132,7 @@ "-u", "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json index 69f0988939..4f026d58d0 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader.json @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", @@ -368,7 +368,7 @@ "cwd": "[START_DIR]/skia", "env": { "CHROME_HEADLESS": "1", - "LD_LIBRARY_PATH": "[START_DIR]/build/swiftshader_out", + "LD_LIBRARY_PATH": "[START_DIR]/build/out/swiftshader_out", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json index 279eadaa80..6191ec99f0 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index f06203a945..d9e5e2cfb4 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 88406410fa..4d5ddcedc5 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 85da3a7bc4..73dd55b6be 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json index 938cd997e2..71dfa9861f 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 86e12f909f..3ad5b750ff 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 0427b80b77..73179e8864 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 f696774d45..0cf5d7fcab 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 @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 9f35ad8d95..71d88389de 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 @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 aa094cb377..f96dae463c 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 @@ -133,7 +133,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 7efbeb3bc9..c3b9657565 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 @@ -135,7 +135,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 cc3ad73aad..2a0246ddb4 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 @@ -135,7 +135,7 @@ "--error-exitcode=1", "--num-callers=40", "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", 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 acc15b6153..4ec7af3d3b 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 65b57d11ae..da67ec1bc4 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Release_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 908a757772..550530d019 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 09830555ad..8a416c159f 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 ef3d4a146e..066778bb08 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 742d017509..dd205f6ece 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Release_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 6c2a884520..77aac3c6e0 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 e60cb0e054..ec7b8d4d65 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 dcbcf09786..705d316702 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 a41c8cee2b..c2f7b6b9ab 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 554e919320..ff6b9dce22 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 @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]\\build\\dm", + "[START_DIR]\\build\\out\\Debug_x64\\dm", "--resourcePath", "[START_DIR]\\skia\\resources", "--skps", 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 958f41b013..ec28b61cd1 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 @@ -31,7 +31,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/dm.app" + "[START_DIR]/build/out/Release/dm.app" ], "env": { "CHROME_HEADLESS": "1", @@ -46,7 +46,7 @@ "cmd": [ "ideviceinstaller", "-i", - "[START_DIR]/build/nanobench.app" + "[START_DIR]/build/out/Release/nanobench.app" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 458f9a2149..de3b1787a2 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -208,7 +208,7 @@ "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", "[START_DIR]", "catchsegv", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index e2cca0016e..a2f6eb9d95 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -700,7 +700,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Release/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -811,7 +811,7 @@ "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" + "[START_DIR]/build/out/Release" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index ea53e3c768..c033f341de 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -698,7 +698,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -915,7 +915,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json index ee5b41d331..e75fc12839 100644 --- a/infra/bots/recipes/test.expected/failed_push.json +++ b/infra/bots/recipes/test.expected/failed_push.json @@ -71,7 +71,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json index 66353a9a17..8c651aa835 100644 --- a/infra/bots/recipes/test.expected/internal_bot_1.json +++ b/infra/bots/recipes/test.expected/internal_bot_1.json @@ -656,7 +656,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -767,7 +767,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json index d18856590b..2927677876 100644 --- a/infra/bots/recipes/test.expected/internal_bot_2.json +++ b/infra/bots/recipes/test.expected/internal_bot_2.json @@ -656,7 +656,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -767,7 +767,7 @@ "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" + "[START_DIR]/build/out/Debug" ], "env": { "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index 6bb6df1dc4..ae2a8650b8 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -203,7 +203,7 @@ }, { "cmd": [ - "[START_DIR]/build/dm", + "[START_DIR]/build/out/Debug/dm", "--resourcePath", "[START_DIR]/skia/resources", "--skps", diff --git a/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json b/infra/bots/recipes/upload_skiaserve.expected/normal_bot.json index 6403fb32fe..77d285f1a2 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/skiaserve", + "[START_DIR]/build/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 1b36a397e0..251802b943 100644 --- a/infra/bots/recipes/upload_skiaserve.py +++ b/infra/bots/recipes/upload_skiaserve.py @@ -26,7 +26,7 @@ def RunSteps(api): # Do not upload skiaserve for trybots. return - src = api.vars.build_dir.join('skiaserve') + src = api.vars.build_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']) |