Index: scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_win_cov_try.json |
diff --git a/scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_win_cov_try.json b/scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_win_cov_try.json |
index 7012a50d3b0ebeb871cb64f9965c3b4b8ea3d83d..a158802bcfe27eb4334f434a9e0ed7691e084156 100644 |
--- a/scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_win_cov_try.json |
+++ b/scripts/slave/recipes/syzygy/coverage.expected/full_master_client_syzygy_win_cov_try.json |
@@ -5,6 +5,7 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "taskkill" |
}, |
{ |
@@ -19,13 +20,13 @@ |
"--slave", |
"vm331-m3", |
"--spec", |
- "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\"}", |
"--git-cache-dir", |
- "[ROOT]\\b\\build\\slave\\cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -33,6 +34,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -72,6 +74,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
"GYP_DEFINES": "target_arch=ia32", |
@@ -95,15 +98,16 @@ |
"--target", |
"Coverage", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--ninja-ensure-up-to-date", |
"--", |
"build_all" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -113,12 +117,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\syzygy\\build\\generate_coverage.py", |
+ "[SLAVE_BUILD]\\src\\syzygy\\build\\generate_coverage.py", |
"--verbose", |
"--syzygy", |
"--build-dir", |
- "[CWD]\\src\\out\\Coverage" |
+ "[SLAVE_BUILD]\\src\\out\\Coverage" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "capture_unittest_coverage" |
}, |
{ |