Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json |
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json |
index 11f2d8f4ece5fc057bd1594dc1896f02e40a0c77..33507c6e994f8a4b6c469d2270708b2f82c44267 100644 |
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json |
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac_asan.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"slavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,7 +25,6 @@ |
"--force", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -54,10 +53,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": "asan=1 clang=1 component=static_library fastbuild=0 gomadir='[BUILD]/goma' lsan=1 target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "asan=1 clang=1 component=static_library fastbuild=0 gomadir='[ROOT]/b/build/goma' lsan=1 target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -69,11 +67,10 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[SLAVE_BUILD]/src", |
+ "[CWD]/src", |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -100,9 +97,9 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[SLAVE_BUILD]/src", |
+ "[CWD]/src", |
"--goma-cache-dir", |
- "[GOMA_CACHE]", |
+ "[ROOT]/b/build/slave/goma_cache", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -112,11 +109,10 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/build/goma", |
"--", |
"All" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -143,7 +139,6 @@ |
"--enable-asan", |
"libyuv_unittest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "libyuv_unittest" |
}, |
{ |