diff options
author | Ben Wagner <benjaminwagner@google.com> | 2018-04-26 18:19:25 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 22:21:04 +0000 |
commit | 01d3eb64e7b11b22cf206758f01b06a7ae0bbb20 (patch) | |
tree | 2c53c65e62df6387cf77b1a33a447a47024e1b3f /infra/bots/recipe_modules | |
parent | bf134d2283570786984f2c1630abbbc2c2e1bf09 (diff) |
Revert "[recipes] Use named caches for git and workdirs"
This reverts commit e8615f969e92009551b70c85d1913202390e0b0d.
Reason for revert: Causing CommandBuffer builds to time out
Original change's description:
> [recipes] Use named caches for git and workdirs
>
> Bug: skia:
> Change-Id: Iaf3d190252c9483c8b9e58a3ab0305db4173cc1c
> Reviewed-on: https://skia-review.googlesource.com/123929
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
----------------
Revert "[infra] Fix missing cache for Bookmaker"
This reverts commit d19f039a16cc4ed29dc6f0ef7100125819ca291d.
Reason for revert: Need to revert https://skia-review.googlesource.com/123929
Original change's description:
> [infra] Fix missing cache for Bookmaker
>
> Bug: skia:
> Change-Id: I12d42fa1bb364ea6c75865f72143daf92b8c12c3
> Reviewed-on: https://skia-review.googlesource.com/124052
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
----------------
Revert "Fix missing/duplicate named caches"
This reverts commit 0820a6fb697be598b41b65c7645659e216b30bc5.
Reason for revert: Need to revert https://skia-review.googlesource.com/123929
Original change's description:
> Fix missing/duplicate named caches
>
> Fixes issue with https://skia-review.googlesource.com/c/skia/+/123929
>
> No-Try: true
> Change-Id: I582b2bba67b8b257f35c5b85ccfe6e6304ff7a7c
> Reviewed-on: https://skia-review.googlesource.com/124180
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
----------------
TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com
Change-Id: Id8443ad9dc50f018251a6b6892b06fe256e6c578
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/124203
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
41 files changed, 429 insertions, 420 deletions
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json index cf2c43fcb2..a2967213c3 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_/_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_/_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -49,7 +49,7 @@ "--revision", "src@origin/lkcr" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -103,7 +103,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", diff --git a/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json index 4399b6cde2..af1d2a63b8 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_/_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'parent_repo', 'url': 'https://skia.googlesource.com/parent_repo.git'}]", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'parent_repo', 'url': 'https://skia.googlesource.com/parent_repo.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"parent_repo\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_/_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -51,7 +51,7 @@ "--revision", "parent_repo@abc123" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" diff --git a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json index c73455d175..b41ff52e47 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work/flutter" + "[CUSTOM_/_B_WORK]/flutter" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/flutter/.gclient_entries" + "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/flutter/.gclient_entries" + "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", "--patch_root", "src/third_party/skia", "--revision_mapping_file", "{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_/_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -53,7 +53,7 @@ "--revision", "src/third_party/skia@abc123" ], - "cwd": "[START_DIR]/cache/work/flutter", + "cwd": "[CUSTOM_/_B_WORK]/flutter", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" diff --git a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json index ffce3b2ee9..162d5d2f2b 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_C:\\_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_C:\\_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123^" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_C:\\_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" diff --git a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json index 2a1eb4cb64..8be1f734d4 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_C:\\_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_C:\\_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -47,7 +47,7 @@ "--revision", "skia@abc123" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_C:\\_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" diff --git a/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json index fe3983f59c..03aed27295 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_/_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", "--patch_root", "pdfium/third_party/skia", "--revision_mapping_file", "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_/_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -53,7 +53,7 @@ "--revision", "pdfium/third_party/skia@abc123" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" diff --git a/infra/bots/recipe_modules/core/examples/full.expected/test.json b/infra/bots/recipe_modules/core/examples/full.expected/test.json index ef0d4965bc..82df2360ab 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/test.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_C:\\_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", "--patch_root", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_C:\\_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--gerrit_repo", @@ -51,7 +51,7 @@ "--revision", "skia@abc123" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_C:\\_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json index a69acebd09..a3ad9608e0 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=26 target_cpu=\"arm\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json index 05ce497a28..07347cc401 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=21 sanitize=\"ASAN\" target_cpu=\"arm\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json index 10a00fc0af..6e2e365730 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,33 +17,33 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-march=armv7-a\", \"-mfpu=neon\", \"-mthumb\"] extra_cflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-I[START_DIR]/chromebook_arm_gles/include\", \"-I[START_DIR]/armhf_sysroot/include\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4/arm-linux-gnueabihf\", \"-DMESA_EGL_NO_X11_HEADERS\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-B[START_DIR]/armhf_sysroot/bin\", \"-B[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/lib\", \"-L[START_DIR]/chromebook_arm_gles/lib\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"arm\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" }, "name": "gn gen" }, @@ -53,17 +53,17 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES/Release", "nanobench", "dm" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 646dd1bee0..4f28854507 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" sanitize=\"ASAN\" target_cpu=\"arm64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json index 30d12b2a50..6dee9daf05 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,14 +17,14 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" }, "infra_step": true, "name": "fetch-gn" @@ -40,7 +40,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]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" }, "name": "go version" }, @@ -55,7 +55,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]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" }, "name": "env go version" }, @@ -73,7 +73,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]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" }, "name": "update go pkgs" }, @@ -82,8 +82,8 @@ "go", "build", "-o", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel/run_testlab", - "[START_DIR]/cache/work/skia/infra/cts/run_testlab.go" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel/run_testlab", + "[CUSTOM_/_B_WORK]/skia/infra/cts/run_testlab.go" ], "env": { "BUILDTYPE": "devrel", @@ -91,23 +91,23 @@ "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]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" }, "name": "build firebase runner" }, { "cmd": [ - "[START_DIR]/cache/work/skia/tools/skqp/make_universal_apk" + "[CUSTOM_/_B_WORK]/skia/tools/skqp/make_universal_apk" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "ANDROID_HOME": "[START_DIR]/android_sdk_linux/android-sdk", "ANDROID_NDK": "[START_DIR]/android_ndk_linux", - "APK_OUTPUT_DIR": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel", + "APK_OUTPUT_DIR": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel", "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" }, "name": "make_universal" }, @@ -119,7 +119,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/cts/whitelist_devices.json", + "[CUSTOM_/_B_WORK]/skia/infra/cts/whitelist_devices.json", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json index a078e34384..da96284755 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES/Debug", "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\", \"-I[START_DIR]/chromebook_x86_64_gles/include\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-L[START_DIR]/chromebook_x86_64_gles/lib\", \"-static-libstdc++\", \"-static-libgcc\", \"-fuse-ld=lld\"] skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" }, "name": "gn gen" }, @@ -51,16 +51,16 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES/Debug", "nanobench", "dm" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json index bdb433f2de..e9455576d1 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41/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\", \"-DSK_CPU_LIMIT_SSE41\", \"-DSKCMS_PORTABLE\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index fd55e9c8fe..435eae2194 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/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\", \"-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json index 787491ef69..98475cfaf4 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/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\", \"-march=native\", \"-fomit-frame-pointer\", \"-O3\", \"-ffp-contract=off\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json index 6000c10ee0..f61cc7e46a 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/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\"] is_component_build=true is_debug=false is_official_build=true skia_enable_effects=false skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_zlib=false target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json index 70ae6b8122..a7df278e86 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -23,7 +23,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out" ], "infra_step": true, "name": "makedirs swiftshader_out" @@ -31,17 +31,17 @@ { "cmd": [ "cmake", - "[START_DIR]/cache/work/skia/third_party/externals/swiftshader", + "[CUSTOM_/_B_WORK]/skia/third_party/externals/swiftshader", "-GNinja" ], - "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", + "cwd": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", "env": { "BUILDTYPE": "Release", "CC": "[START_DIR]/clang_linux/bin/clang", "CHROME_HEADLESS": "1", "CXX": "[START_DIR]/clang_linux/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" }, "name": "swiftshader cmake" }, @@ -49,18 +49,18 @@ "cmd": [ "ninja", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", "libEGL.so", "libGLESv2.so" ], - "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", + "cwd": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", "env": { "BUILDTYPE": "Release", "CC": "[START_DIR]/clang_linux/bin/clang", "CHROME_HEADLESS": "1", "CXX": "[START_DIR]/clang_linux/bin/clang++", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" }, "name": "swiftshader ninja" }, @@ -68,31 +68,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/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\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/swiftshader/include\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\"" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/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\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[CUSTOM_/_B_WORK]/skia/third_party/externals/swiftshader/include\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" }, "name": "gn gen" }, @@ -102,14 +102,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" }, "name": "ninja" }, @@ -118,7 +118,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]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", "[START_DIR]/[SWARM_OUT_DIR]/out/swiftshader_out" ], "infra_step": true, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json index 6a24e90bc4..c89c2b2493 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/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\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/linux_vulkan_sdk\" target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json index 863f7ea7b1..caf77dcae5 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/emscripten_sdk/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/emscripten_sdk/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release/Release", "--args=cc=\"[START_DIR]/emscripten_sdk/emscripten/incoming/emcc\" cxx=\"[START_DIR]/emscripten_sdk/emscripten/incoming/em++\" extra_cflags=[\"-Wno-unknown-warning-option\", \"-DDUMMY_emscripten_sdk_version=42\"] is_debug=false skia_enable_gpu=false skia_use_dng_sdk=false skia_use_fontconfig=false skia_use_freetype=false skia_use_icu=false target_cpu=\"wasm\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-EMCC-wasm-Release" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json index e6b90c0cfd..92099f6c9b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/mips64el_toolchain_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/mips64el_toolchain_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,32 +17,32 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-loongson3a-Release" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-loongson3a-Release/Release", "--args=cc=\"[START_DIR]/mips64el_toolchain_linux/bin/mips64el-linux-gnuabi64-gcc-7\" cxx=\"[START_DIR]/mips64el_toolchain_linux/bin/mips64el-linux-gnuabi64-g++-7\" extra_cflags=[\"-Wno-format-truncation\", \"-Wno-uninitialized\", \"-DDUMMY_mips64el_toolchain_linux_version=42\", \"-Wno-strict-overflow\"] extra_ldflags=[\"-L[START_DIR]/mips64el_toolchain_linux/mips64el-linux-gnuabi64/lib\"] is_debug=false skia_enable_gpu=false skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"loongson3a\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/mips64el_toolchain_linux/lib/x86_64-linux-gnu/", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-loongson3a-Release" }, "name": "gn gen" }, @@ -52,15 +52,15 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-loongson3a-Release/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/mips64el_toolchain_linux/lib/x86_64-linux-gnu/", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-loongson3a-Release" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json index 5d5fa6ba0e..206b359afe 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json @@ -3,31 +3,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] skia_embed_resoucres=true target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index 77a47b269f..9257b13d44 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json @@ -3,31 +3,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false skia_use_angle=true target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json index 13401a8ac8..df0b1af034 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json @@ -6,7 +6,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[START_DIR]/cache/work/flutter/src", + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -20,9 +20,9 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/cache/work/flutter/src/out/android_release" + "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], - "cwd": "[START_DIR]/cache/work/flutter/src", + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "infra_step": true, "name": "rmtree android_release" }, @@ -32,12 +32,12 @@ "--runtime-mode=release", "--android" ], - "cwd": "[START_DIR]/cache/work/flutter/src", + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" }, "name": "gn_gen" }, @@ -48,12 +48,12 @@ "out/android_release", "-j100" ], - "cwd": "[START_DIR]/cache/work/flutter/src", + "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" }, "name": "build_flutter" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json index 6188af0c8b..48969fb3cf 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json @@ -3,31 +3,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false skia_enable_gpu=false target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json index 0df8515dda..9c31d772cc 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json @@ -6,7 +6,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" @@ -19,13 +19,13 @@ "build/linux/sysroot_scripts/install-sysroot.py", "--arch=amd64" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "sysroot" }, @@ -36,14 +36,14 @@ "out/skia", "--args=pdf_is_standalone=true clang_use_chrome_plugins=false is_component_build=false is_debug=false pdf_use_skia=true" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "gn_gen" }, @@ -54,14 +54,14 @@ "out/skia", "-j100" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json index b8bedc2f26..2c0f40ff7e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -6,7 +6,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" @@ -19,13 +19,13 @@ "build/linux/sysroot_scripts/install-sysroot.py", "--arch=amd64" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "sysroot" }, @@ -36,14 +36,14 @@ "out/skia", "--args=pdf_is_standalone=true clang_use_chrome_plugins=false is_component_build=false is_debug=false pdf_use_skia_paths=true" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "gn_gen" }, @@ -54,14 +54,14 @@ "out/skia", "-j100" ], - "cwd": "[START_DIR]/cache/work/pdfium", + "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "CHROMIUM_BUILDTOOLS_PATH": "[START_DIR]/cache/work/pdfium/buildtools", + "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", "DEPOT_TOOLS_UPDATE": "0", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" }, "name": "build_pdfium" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json index add87e5cef..d34dc8701e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json @@ -3,31 +3,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_component_build=true is_debug=false target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release" + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json index c7b06d6c25..846634c05d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_darwin/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_darwin/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan/Debug", "--args=extra_cflags=[\"-O1\", \"-DDUMMY_ndk_version=42\"] ndk=\"[START_DIR]/android_ndk_darwin\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 30d564fa23..a75f13c717 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -3,31 +3,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"arm64\" target_os=\"ios\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 8c7a6faa76..6a1b1f600c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -3,11 +3,11 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/tools/build_command_buffer.py", + "[CUSTOM_/_B_WORK]/skia/tools/build_command_buffer.py", "--chrome-dir", - "[START_DIR]/cache/work", + "[CUSTOM_/_B_WORK]", "--output-dir", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", "--no-sync", "--no-hooks", "--make-output-dir" @@ -16,7 +16,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "build command_buffer" }, @@ -24,31 +24,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "gn gen" }, @@ -58,14 +58,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json index 783221a11e..4333e95cc9 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json @@ -3,31 +3,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal/Debug", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Metal/Debug", "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] skia_use_metal=true target_cpu=\"x86_64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" }, "name": "gn gen" }, @@ -37,14 +37,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal/Debug" + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Metal/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json index 383ad76335..7c6eb71db0 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_windows/VERSION", + "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/android_ndk_windows/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-arm64-Release-Android" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn.exe", + "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android/Release", + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-arm64-Release-Android/Release", "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/n\" target_cpu=\"arm64\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-arm64-Release-Android" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android/Release" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-arm64-Release-Android/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-arm64-Release-Android" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json index 307d949e6c..822c2738c3 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", + "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn.exe", + "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug", + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json index ab166a7201..97e14930b6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", + "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn.exe", + "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64", + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI/Debug_x64" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GDI" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index fd151d72de..a844cff802 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", + "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn.exe", + "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_vulkan_sdk=\"[START_DIR]/win_vulkan_sdk\" target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json index 2e5d55d5b2..b21990314d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION", + "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,31 +17,31 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn.exe", + "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", "gen", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release/Release_x64", + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64", "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release" }, "name": "gn gen" }, @@ -51,14 +51,14 @@ "-k", "0", "-C", - "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release/Release_x64" + "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release/Release_x64" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index a6975b514e..964fe89f6c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -3,9 +3,9 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -19,9 +19,9 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-clang-format" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-clang-format" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -33,16 +33,16 @@ }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/build/out/Release", "--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/build/out" }, "name": "gn gen" @@ -55,11 +55,11 @@ "-C", "[START_DIR]/build/out/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/cache/work/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "[CUSTOM_/_B_WORK]/skia/bin:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/build/out" }, "name": "ninja" @@ -128,7 +128,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/skp/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -156,7 +156,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/skimage/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -184,7 +184,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/svg/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "infra_step": true, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json index 87c71d95f5..84aca5d680 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json @@ -7,7 +7,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,9 +17,9 @@ "cmd": [ "python", "-u", - "[START_DIR]/cache/work/skia/bin/fetch-gn" + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -31,12 +31,12 @@ }, { "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/build/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": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -53,7 +53,7 @@ "-C", "[START_DIR]/build/out/Release" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -126,7 +126,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/skp/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -154,7 +154,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/skimage/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -182,7 +182,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/svg/VERSION", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -212,7 +212,7 @@ "[START_DIR]/build/out/Release/nanobench", "--some-flag" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json index 0d4e279414..e183a110cc 100644 --- a/infra/bots/recipe_modules/run/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json @@ -7,7 +7,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "fail", "~followup_annotations": [ @@ -23,7 +23,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "fail again", "~followup_annotations": [ @@ -40,7 +40,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "do a thing" }, @@ -53,7 +53,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "run 0" }, @@ -106,7 +106,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/my_asset/VERSION", + "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/my_asset/VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -120,7 +120,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "mydir:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "env" }, @@ -170,7 +170,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail", "~followup_annotations": [ @@ -187,7 +187,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #1" }, @@ -199,7 +199,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 2)", "~followup_annotations": [ @@ -216,7 +216,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #2" }, @@ -228,7 +228,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 3)", "~followup_annotations": [ @@ -245,7 +245,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #3" }, @@ -257,7 +257,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 4)", "~followup_annotations": [ @@ -274,7 +274,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #4" }, @@ -286,7 +286,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry fail (attempt 5)", "~followup_annotations": [ @@ -302,7 +302,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success", "~followup_annotations": [ @@ -319,7 +319,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #1 (2)" }, @@ -331,7 +331,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success (attempt 2)", "~followup_annotations": [ @@ -348,7 +348,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "between_attempts #2 (2)" }, @@ -360,7 +360,7 @@ "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" }, "name": "retry success (attempt 3)" }, diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 28589377cd..26bde8c9d8 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -15,6 +15,12 @@ CONFIG_RELEASE = 'Release' class SkiaVarsApi(recipe_api.RecipeApi): + def make_path(self, *path): + """Return a Path object for the given path.""" + key = 'custom_%s' % '_'.join(path) + self.m.path.c.base_paths[key] = tuple(path) + return self.m.path[key] + def setup(self): """Prepare the variables.""" # Setup @@ -53,10 +59,13 @@ class SkiaVarsApi(recipe_api.RecipeApi): if 'Coverage' in self.builder_name and 'Upload' in self.builder_name: self.persistent_checkout = True - self.cache_dir = self.slave_dir.join('cache') if self.persistent_checkout: - self.checkout_root = self.cache_dir.join('work') - self.gclient_cache = self.cache_dir.join('git') + if 'Win' in self.builder_name: + self.checkout_root = self.make_path('C:\\', 'b', 'work') + self.gclient_cache = self.make_path('C:\\', 'b', 'cache') + else: + self.checkout_root = self.make_path('/', 'b', 'work') + self.gclient_cache = self.make_path('/', 'b', 'cache') # got_revision is filled in after checkout steps. self.got_revision = None |