Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_linux_mips64el_compile_rel.json |
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_linux_mips64el_compile_rel.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_linux_mips64el_compile_rel.json |
index c37832f041c4cb4cf934951e795f1c1e16ba0de6..11d2ed6d50ccae499535972b4ed430fac7580c5b 100644 |
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_linux_mips64el_compile_rel.json |
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_linux_mips64el_compile_rel.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]", |
"--root", |
"v8", |
"--revision_mapping_file", |
"{\"v8\": \"got_revision\"}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--issue", |
"12853011", |
"--patchset", |
@@ -31,7 +31,6 @@ |
"--no_shallow", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -70,10 +69,9 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 dcheck_always_on=0 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1 v8_target_arch=mips64el", |
+ "GYP_DEFINES": "clang=1 dcheck_always_on=0 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1 v8_target_arch=mips64el", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -88,7 +86,6 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -98,11 +95,10 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[SLAVE_BUILD]/v8", |
+ "[CWD]/v8", |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -129,9 +125,9 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[SLAVE_BUILD]/v8", |
+ "[CWD]/v8", |
"--goma-cache-dir", |
- "[GOMA_CACHE]", |
+ "[ROOT]/b/build/slave/goma_cache", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -141,12 +137,11 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/build/goma", |
"--goma-fail-fast", |
"--goma-disable-local-fallback", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |