Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64_ASAN.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64_ASAN.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64_ASAN.json |
index 682386f35daa4a77d2f9f9ace3f8e646d4ad2e55..47fdb0a70957c72b916923e0b47ad7a48d6e3b29 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64_ASAN.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac64_ASAN.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\", \"v8/tools/swarming_client\": \"got_swarming_client_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]" |
}, |
@@ -69,10 +68,9 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
+ "[CWD]/v8/tools/swarming_client/swarming.py", |
"--version" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "swarming.py --version", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -86,10 +84,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 fastbuild=0 gomadir='[BUILD]/goma' lsan=1 target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "asan=1 clang=1 fastbuild=0 gomadir='[ROOT]/b/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]" |
}, |
@@ -104,7 +101,6 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -114,11 +110,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" |
}, |
@@ -145,9 +140,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", |
@@ -157,10 +152,9 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/build/goma", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -175,17 +169,16 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[SLAVE_BUILD]/v8/tools/swarming_client", |
+ "[CWD]/v8/tools/swarming_client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Release/ignition.isolated.gen.json" |
+ "[CWD]/v8/out/Release/bot_default.isolated.gen.json", |
+ "[CWD]/v8/out/Release/ignition.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -199,7 +192,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
+ "[CWD]/v8/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -274,7 +267,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Check on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -313,7 +305,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py", |
+ "[CWD]/v8/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -389,7 +381,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Ignition - turbofan on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -413,9 +404,9 @@ |
"-u", |
"RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", |
"--swarming-client-dir", |
- "[SLAVE_BUILD]/v8/tools/swarming_client", |
+ "[CWD]/v8/tools/swarming_client", |
"--temp-root-dir", |
- "[TMP_BASE]", |
+ "[TMP]", |
"--merged-test-output", |
"/path/to/tmp/json", |
"--", |
@@ -428,7 +419,6 @@ |
"4", |
"Check/Mac-10.9/[dummy has/V8 Mac64 ASAN/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -454,9 +444,9 @@ |
"-u", |
"RECIPE_MODULE[build::v8]/resources/collect_v8_task.py", |
"--swarming-client-dir", |
- "[SLAVE_BUILD]/v8/tools/swarming_client", |
+ "[CWD]/v8/tools/swarming_client", |
"--temp-root-dir", |
- "[TMP_BASE]", |
+ "[TMP]", |
"--merged-test-output", |
"/path/to/tmp/json", |
"--", |
@@ -469,7 +459,6 @@ |
"1", |
"Ignition - turbofan/Mac-10.9/[dummy has/V8 Mac64 ASAN/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |