Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_dbg.json |
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_dbg.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_dbg.json |
index 15a66194a8d01eb527c42b47c51729d3724abaae..3e971b93f29a16f3d3b9382330291bb8ab051b4a 100644 |
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_dbg.json |
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_mac64_dbg.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", |
"--issue", |
"12853011", |
"--patchset", |
@@ -31,7 +31,6 @@ |
"--no_shallow", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -75,10 +74,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": [ |
@@ -92,10 +90,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": "clang=1 dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x64", |
+ "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_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x64", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -110,7 +107,6 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -120,11 +116,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" |
}, |
@@ -151,9 +146,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", |
@@ -163,12 +158,11 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[ROOT]/b/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" |
}, |
@@ -183,20 +177,19 @@ |
"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/Debug/bot_default.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Debug/ignition.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Debug/mozilla.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Debug/simdjs.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Debug/test262.isolated.gen.json" |
+ "[CWD]/v8/out/Debug/bot_default.isolated.gen.json", |
+ "[CWD]/v8/out/Debug/ignition.isolated.gen.json", |
+ "[CWD]/v8/out/Debug/mozilla.isolated.gen.json", |
+ "[CWD]/v8/out/Debug/simdjs.isolated.gen.json", |
+ "[CWD]/v8/out/Debug/test262.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -213,7 +206,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", |
@@ -294,7 +287,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@{@@@", |
@@ -321,7 +313,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", |
@@ -403,7 +395,6 @@ |
"--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@{@@@", |
@@ -424,7 +415,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", |
@@ -505,7 +496,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Mozilla on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -526,7 +516,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", |
@@ -608,7 +598,6 @@ |
"--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@{@@@", |
@@ -629,7 +618,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", |
@@ -711,7 +700,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@{@@@", |
@@ -735,9 +723,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", |
"--", |
@@ -750,7 +738,6 @@ |
"2", |
"Check/Mac-10.9/[dummy has/v8_mac64_dbg/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -776,9 +763,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", |
"--", |
@@ -791,7 +778,6 @@ |
"1", |
"Test262 - no variants/Mac-10.9/[dummy has/v8_mac64_dbg/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -817,9 +803,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", |
"--", |
@@ -832,7 +818,6 @@ |
"1", |
"Mozilla/Mac-10.9/[dummy has/v8_mac64_dbg/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Mozilla", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -858,9 +843,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", |
"--", |
@@ -873,7 +858,6 @@ |
"1", |
"SimdJs - all/Mac-10.9/[dummy has/v8_mac64_dbg/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "SimdJs - all", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -899,9 +883,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", |
"--", |
@@ -914,7 +898,6 @@ |
"1", |
"Ignition - turbofan/Mac-10.9/[dummy has/v8_mac64_dbg/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |