Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac.json |
index 100064e345833d382dc97d32f784b568f681df85..e5b8b6e1ac9fcf1ab6ea7080843714b9a2da4d71 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Mac.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": "clang=1 gomadir='[ROOT]/b/build/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "clang=1 gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32", |
"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,19 +175,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@{@@@", |
@@ -198,7 +205,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", |
@@ -272,6 +279,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@{@@@", |
@@ -292,7 +300,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", |
@@ -367,6 +375,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@{@@@", |
@@ -387,7 +396,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", |
@@ -461,6 +470,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@{@@@", |
@@ -481,7 +491,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", |
@@ -556,6 +566,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@{@@@", |
@@ -576,7 +587,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", |
@@ -651,6 +662,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@{@@@", |
@@ -674,9 +686,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", |
"--", |
@@ -689,6 +701,7 @@ |
"1", |
"Check/Mac-10.9/[dummy has/V8 Mac/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -714,9 +727,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", |
"--", |
@@ -729,6 +742,7 @@ |
"1", |
"Test262 - no variants/Mac-10.9/[dummy has/V8 Mac/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -754,9 +768,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", |
"--", |
@@ -769,6 +783,7 @@ |
"1", |
"Mozilla/Mac-10.9/[dummy has/V8 Mac/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Mozilla", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -794,9 +809,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", |
"--", |
@@ -809,6 +824,7 @@ |
"1", |
"SimdJs - all/Mac-10.9/[dummy has/V8 Mac/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "SimdJs - all", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -834,9 +850,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", |
"--", |
@@ -849,6 +865,7 @@ |
"1", |
"Ignition - turbofan/Mac-10.9/[dummy has/V8 Mac/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |