Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_ASAN.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_ASAN.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_ASAN.json |
index cb1524e53aa23ebc9273ab814d3ffff092092257..a9612559a7c3b9f6347baab9961f9c07e9cb14cc 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_ASAN.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_ASAN.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "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'}]", |
+ "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'}]", |
"--root", |
"v8", |
"--revision_mapping_file", |
"{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,6 +25,7 @@ |
"--no_shallow", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -68,9 +69,10 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/v8/tools/swarming_client/swarming.py", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
"--version" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "swarming.py --version", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -84,9 +86,10 @@ |
"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='[ROOT]/b/build/goma' lsan=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "asan=1 clang=1 gomadir='[BUILD]/goma' lsan=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -101,6 +104,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -110,10 +114,11 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[CWD]/v8", |
+ "[SLAVE_BUILD]/v8", |
"--output-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -140,9 +145,9 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[CWD]/v8", |
+ "[SLAVE_BUILD]/v8", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -152,9 +157,10 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[BUILD]/goma", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -169,17 +175,18 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[CWD]/v8/tools/swarming_client", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[CWD]/v8/out/Release/bot_default.isolated.gen.json", |
- "[CWD]/v8/out/Release/ignition.isolated.gen.json", |
- "[CWD]/v8/out/Release/test262.isolated.gen.json" |
+ "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json", |
+ "[SLAVE_BUILD]/v8/out/Release/ignition.isolated.gen.json", |
+ "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -194,7 +201,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/v8/tools/swarming_client/swarming.py", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -269,6 +276,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Check on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -295,7 +303,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/v8/tools/swarming_client/swarming.py", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -371,6 +379,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Test262 - no variants on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -391,7 +400,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/v8/tools/swarming_client/swarming.py", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -467,6 +476,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Ignition - turbofan on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -490,9 +500,9 @@ |
"-u", |
"RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", |
"--swarming-client-dir", |
- "[CWD]/v8/tools/swarming_client", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client", |
"--temp-root-dir", |
- "[TMP]", |
+ "[TMP_BASE]", |
"--merged-test-output", |
"/path/to/tmp/json", |
"--", |
@@ -505,6 +515,7 @@ |
"2", |
"Check/Ubuntu-14.04/[dummy has/V8 Linux64 ASAN/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -530,9 +541,9 @@ |
"-u", |
"RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", |
"--swarming-client-dir", |
- "[CWD]/v8/tools/swarming_client", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client", |
"--temp-root-dir", |
- "[TMP]", |
+ "[TMP_BASE]", |
"--merged-test-output", |
"/path/to/tmp/json", |
"--", |
@@ -545,6 +556,7 @@ |
"1", |
"Test262 - no variants/Ubuntu-14.04/[dummy has/V8 Linux64 ASAN/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -570,9 +582,9 @@ |
"-u", |
"RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", |
"--swarming-client-dir", |
- "[CWD]/v8/tools/swarming_client", |
+ "[SLAVE_BUILD]/v8/tools/swarming_client", |
"--temp-root-dir", |
- "[TMP]", |
+ "[TMP_BASE]", |
"--merged-test-output", |
"/path/to/tmp/json", |
"--", |
@@ -585,6 +597,7 @@ |
"1", |
"Ignition - turbofan/Ubuntu-14.04/[dummy has/V8 Linux64 ASAN/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -605,6 +618,7 @@ |
}, |
{ |
"cmd": [], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "trigger", |
"trigger_specs": [ |
{ |