Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json |
index e163494b06c08c33bb863c56414e8f9847bc2639..0a7e69e2d14550b4fdd36998aa474bdb9f0b00b2 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64___cfi.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": "cfi_diag=1 cfi_vptr=1 clang=1 gomadir='[BUILD]/goma' release_extra_cflags='-O1 -fno-inline-functions -fno-inline' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "cfi_diag=1 cfi_vptr=1 clang=1 gomadir='[ROOT]/b/build/goma' release_extra_cflags='-O1 -fno-inline-functions -fno-inline' 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,22 +169,21 @@ |
"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/benchmarks.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/optimize_for_size.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Release/simdjs.isolated.gen.json", |
- "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json" |
+ "[CWD]/v8/out/Release/benchmarks.isolated.gen.json", |
+ "[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/optimize_for_size.isolated.gen.json", |
+ "[CWD]/v8/out/Release/simdjs.isolated.gen.json", |
+ "[CWD]/v8/out/Release/test262.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -209,7 +202,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", |
@@ -284,7 +277,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Check on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -305,7 +297,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", |
@@ -381,7 +373,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] OptimizeForSize on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -402,7 +393,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", |
@@ -478,7 +469,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Benchmarks on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -499,7 +489,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", |
@@ -575,7 +565,6 @@ |
"--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@{@@@", |
@@ -596,7 +585,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", |
@@ -671,7 +660,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Mozilla on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -692,7 +680,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", |
@@ -768,7 +756,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] SimdJs - all on Ubuntu-14.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -789,7 +776,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", |
@@ -865,7 +852,6 @@ |
"--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@{@@@", |
@@ -889,9 +875,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", |
"--", |
@@ -904,7 +890,6 @@ |
"1", |
"Check/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -930,9 +915,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", |
"--", |
@@ -945,7 +930,6 @@ |
"1", |
"OptimizeForSize/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "OptimizeForSize", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -971,9 +955,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", |
"--", |
@@ -986,7 +970,6 @@ |
"1", |
"Benchmarks/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Benchmarks", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -1012,9 +995,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", |
"--", |
@@ -1027,7 +1010,6 @@ |
"1", |
"Test262 - no variants/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -1053,9 +1035,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", |
"--", |
@@ -1068,7 +1050,6 @@ |
"1", |
"Mozilla/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Mozilla", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -1094,9 +1075,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", |
"--", |
@@ -1109,7 +1090,6 @@ |
"1", |
"SimdJs - all/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "SimdJs - all", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -1135,9 +1115,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", |
"--", |
@@ -1150,7 +1130,6 @@ |
"1", |
"Ignition - turbofan/Ubuntu-14.04/[dummy has/V8 Linux64 - cfi/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |