Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_TSAN.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_TSAN.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_TSAN.json |
index 971a505f6a27c08399c20105bf13b43c5c85a6e3..323a456dd7fdbebede6f62590dd63a21a32c203e 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_TSAN.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux64_TSAN.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": "clang=1 disable_nacl=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare tsan=1 use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "clang=1 disable_nacl=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 test_isolation_mode=prepare tsan=1 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,18 +169,17 @@ |
"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", |
- "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json" |
+ "[CWD]/v8/out/Release/bot_default.isolated.gen.json", |
+ "[CWD]/v8/out/Release/ignition.isolated.gen.json", |
+ "[CWD]/v8/out/Release/test262.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -201,7 +194,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", |
@@ -276,7 +269,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@{@@@", |
@@ -297,7 +289,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", |
@@ -373,7 +365,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@{@@@", |
@@ -400,7 +391,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", |
@@ -476,7 +467,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@{@@@", |
@@ -500,9 +490,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", |
"--", |
@@ -515,7 +505,6 @@ |
"1", |
"Check/Ubuntu-14.04/[dummy has/V8 Linux64 TSAN/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -541,9 +530,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", |
"--", |
@@ -556,7 +545,6 @@ |
"2", |
"Test262 - no variants/Ubuntu-14.04/[dummy has/V8 Linux64 TSAN/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -582,9 +570,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", |
"--", |
@@ -597,7 +585,6 @@ |
"1", |
"Ignition - turbofan/Ubuntu-14.04/[dummy has/V8 Linux64 TSAN/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |