Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json |
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json |
index 881728348d67b10acdd6d27360a88444af0db5b6..01033797a99546212ec53db308539f0a1a4c6ad3 100644 |
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.json |
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_rel.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]", |
"--issue", |
"12853011", |
"--patchset", |
@@ -31,6 +31,7 @@ |
"--no_shallow", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -74,9 +75,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": [ |
@@ -90,9 +92,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": "clang=1 dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "clang=1 dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' 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]" |
}, |
@@ -107,6 +110,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -116,10 +120,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" |
}, |
@@ -146,9 +151,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", |
@@ -158,11 +163,12 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/goma", |
+ "[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" |
}, |
@@ -177,19 +183,20 @@ |
"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/mozilla.isolated.gen.json", |
- "[CWD]/v8/out/Release/simdjs.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/mozilla.isolated.gen.json", |
+ "[SLAVE_BUILD]/v8/out/Release/simdjs.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@{@@@", |
@@ -206,7 +213,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", |
@@ -287,6 +294,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Check on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -307,7 +315,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", |
@@ -389,6 +397,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Test262 - no variants on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -409,7 +418,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", |
@@ -490,6 +499,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Mozilla on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -510,7 +520,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", |
@@ -592,6 +602,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] SimdJs - all on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -612,7 +623,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", |
@@ -694,6 +705,7 @@ |
"--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@{@@@", |
@@ -717,9 +729,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", |
"--", |
@@ -732,6 +744,7 @@ |
"1", |
"Check/Mac-10.9/[dummy has/v8_mac64_rel/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -757,9 +770,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", |
"--", |
@@ -772,6 +785,7 @@ |
"1", |
"Test262 - no variants/Mac-10.9/[dummy has/v8_mac64_rel/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -797,9 +811,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", |
"--", |
@@ -812,6 +826,7 @@ |
"1", |
"Mozilla/Mac-10.9/[dummy has/v8_mac64_rel/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Mozilla", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -837,9 +852,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", |
"--", |
@@ -852,6 +867,7 @@ |
"1", |
"SimdJs - all/Mac-10.9/[dummy has/v8_mac64_rel/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "SimdJs - all", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -877,9 +893,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", |
"--", |
@@ -892,6 +908,7 @@ |
"1", |
"Ignition - turbofan/Mac-10.9/[dummy has/v8_mac64_rel/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |