Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json |
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json |
index 10bfe74d13a3859937a2a650e2f91e35c0852506..028ff27e741be4369cd0e509595c656a224d6d69 100644 |
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json |
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Win64.json |
@@ -5,7 +5,6 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "taskkill" |
}, |
{ |
@@ -20,13 +19,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", |
@@ -34,7 +33,6 @@ |
"--no_shallow", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -78,10 +76,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": [ |
@@ -95,10 +92,9 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", |
"runhooks" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
- "GYP_DEFINES": "chromium_win_pch=0 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1 v8_target_arch=x64", |
+ "GYP_DEFINES": "chromium_win_pch=0 fastbuild=1 gomadir='[ROOT]\\b\\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]" |
}, |
@@ -113,7 +109,6 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -131,9 +126,9 @@ |
"--target", |
"Release_x64", |
"--src-dir", |
- "[SLAVE_BUILD]\\v8", |
+ "[CWD]\\v8", |
"--goma-cache-dir", |
- "[GOMA_CACHE]", |
+ "[ROOT]\\b\\build\\slave\\goma_cache", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -143,12 +138,11 @@ |
"--goma-service-account-json-file", |
"C:\\creds\\service_accounts\\service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]\\goma", |
+ "[ROOT]\\b\\build\\goma", |
"--arch", |
"x64", |
"--" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -163,20 +157,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\\Release_x64\\bot_default.isolated.gen.json", |
- "[SLAVE_BUILD]\\v8\\out\\Release_x64\\ignition.isolated.gen.json", |
- "[SLAVE_BUILD]\\v8\\out\\Release_x64\\mozilla.isolated.gen.json", |
- "[SLAVE_BUILD]\\v8\\out\\Release_x64\\simdjs.isolated.gen.json", |
- "[SLAVE_BUILD]\\v8\\out\\Release_x64\\test262.isolated.gen.json" |
+ "[CWD]\\v8\\out\\Release_x64\\bot_default.isolated.gen.json", |
+ "[CWD]\\v8\\out\\Release_x64\\ignition.isolated.gen.json", |
+ "[CWD]\\v8\\out\\Release_x64\\mozilla.isolated.gen.json", |
+ "[CWD]\\v8\\out\\Release_x64\\simdjs.isolated.gen.json", |
+ "[CWD]\\v8\\out\\Release_x64\\test262.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -193,7 +186,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", |
@@ -267,7 +260,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Check on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -288,7 +280,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", |
@@ -363,7 +355,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] SimdJs - all on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -384,7 +375,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", |
@@ -459,7 +450,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Test262 - no variants on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -480,7 +470,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", |
@@ -554,7 +544,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Mozilla on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -575,7 +564,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", |
@@ -650,7 +639,6 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Ignition on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -674,9 +662,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", |
"--", |
@@ -689,7 +677,6 @@ |
"1", |
"Check/Windows-7-SP1/[dummy has/V8 Win64/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -715,9 +702,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", |
"--", |
@@ -730,7 +717,6 @@ |
"1", |
"SimdJs - all/Windows-7-SP1/[dummy has/V8 Win64/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "SimdJs - all", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -756,9 +742,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", |
"--", |
@@ -771,7 +757,6 @@ |
"1", |
"Test262 - no variants/Windows-7-SP1/[dummy has/V8 Win64/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Test262 - no variants", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -797,9 +782,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", |
"--", |
@@ -812,7 +797,6 @@ |
"1", |
"Mozilla/Windows-7-SP1/[dummy has/V8 Win64/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Mozilla", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -838,9 +822,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", |
"--", |
@@ -853,7 +837,6 @@ |
"1", |
"Ignition/Windows-7-SP1/[dummy has/V8 Win64/571" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Ignition", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |