Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_arm___debug_builder.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_arm___debug_builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_arm___debug_builder.json |
index 42ef55ff4fbe2ba01058941cec9207f2d99d4365..9fc77a4a5301db51a9d4e07caf1a91dba3599090 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_arm___debug_builder.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux_ASAN_arm___debug_builder.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", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,7 +25,6 @@ |
"--no_shallow", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -64,10 +63,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 gomadir='[BUILD]/goma' sanitizer_coverage=edge target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=arm", |
+ "GYP_DEFINES": "asan=1 clang=1 gomadir='[ROOT]/b/build/goma' sanitizer_coverage=edge target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=arm", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -82,7 +80,6 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -92,11 +89,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" |
}, |
@@ -123,9 +119,9 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[SLAVE_BUILD]/v8", |
+ "[CWD]/v8", |
"--goma-cache-dir", |
- "[GOMA_CACHE]", |
+ "[ROOT]/b/build/slave/goma_cache", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -135,12 +131,11 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/build/goma", |
"--clobber", |
"--", |
"d8" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -155,10 +150,9 @@ |
"python", |
"-u", |
"\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", |
- "[SLAVE_BUILD]/v8/out/Debug", |
+ "[CWD]/v8/out/Debug", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "listdir build_dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[@@@", |
@@ -179,19 +173,18 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::archive]/resources/zip_archive.py", |
- "[TMP_BASE]/chrome_staging_tmp_1", |
+ "[TMP]/chrome_staging_tmp_1", |
"d8-arm-asan-linux-debug-v8-component-50110", |
"[\"file 1\", \"file 2\"]", |
- "[SLAVE_BUILD]/v8/out/Debug" |
+ "[CWD]/v8/out/Debug" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "zipping" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[DEPOT_TOOLS]/gsutil.py", |
+ "[ROOT]/b/depot_tools/gsutil.py", |
"--", |
"-h", |
"x-goog-meta-Cr-Commit-Position:refs/heads/master@{#50110}", |
@@ -202,10 +195,9 @@ |
"cp", |
"-a", |
"public-read", |
- "[TMP_BASE]/chrome_staging_tmp_1/d8-arm-asan-linux-debug-v8-component-50110.zip", |
+ "[TMP]/chrome_staging_tmp_1/d8-arm-asan-linux-debug-v8-component-50110.zip", |
"gs://v8-asan/linux-debug/d8-arm-asan-linux-debug-v8-component-50110.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/v8-asan/linux-debug/d8-arm-asan-linux-debug-v8-component-50110.zip@@@" |
@@ -216,9 +208,8 @@ |
"python", |
"-u", |
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n", |
- "[TMP_BASE]/chrome_staging_tmp_1/d8-arm-asan-linux-debug-v8-component-50110.zip" |
+ "[TMP]/chrome_staging_tmp_1/d8-arm-asan-linux-debug-v8-component-50110.zip" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "d8-arm-asan-linux-debug-v8-component-50110.zip", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |