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 7f3f2950ea1dd894f480250d2443d713dad906ab..d51d192771a8e812c58d9946724c9427dc5f452f 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,6 +5,7 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "taskkill" |
}, |
{ |
@@ -19,13 +20,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", |
@@ -33,6 +34,7 @@ |
"--no_shallow", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -76,9 +78,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": [ |
@@ -92,9 +95,10 @@ |
"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='[ROOT]\\b\\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='[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]" |
}, |
@@ -109,6 +113,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -126,9 +131,9 @@ |
"--target", |
"Release_x64", |
"--src-dir", |
- "[CWD]\\v8", |
+ "[SLAVE_BUILD]\\v8", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -138,11 +143,12 @@ |
"--goma-service-account-json-file", |
"C:\\creds\\service_accounts\\service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]\\b\\build\\goma", |
+ "[BUILD]\\goma", |
"--arch", |
"x64", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -157,19 +163,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_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" |
+ "[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": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -186,7 +193,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", |
@@ -260,6 +267,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Check on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -280,7 +288,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", |
@@ -355,6 +363,7 @@ |
"--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@{@@@", |
@@ -375,7 +384,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", |
@@ -450,6 +459,7 @@ |
"--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@{@@@", |
@@ -470,7 +480,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", |
@@ -544,6 +554,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Mozilla on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -564,7 +575,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", |
@@ -639,6 +650,7 @@ |
"--json-test-results", |
"${ISOLATED_OUTDIR}/output.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] Ignition - turbofan on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -662,9 +674,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", |
"--", |
@@ -677,6 +689,7 @@ |
"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@@@", |
@@ -702,9 +715,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", |
"--", |
@@ -717,6 +730,7 @@ |
"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@@@", |
@@ -742,9 +756,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", |
"--", |
@@ -757,6 +771,7 @@ |
"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@@@", |
@@ -782,9 +797,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", |
"--", |
@@ -797,6 +812,7 @@ |
"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@@@", |
@@ -822,9 +838,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", |
"--", |
@@ -837,6 +853,7 @@ |
"1", |
"Ignition - turbofan/Windows-7-SP1/[dummy has/V8 Win64/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |