Index: scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_dbg.json |
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_dbg.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_dbg.json |
index 3cde692b46e163ae8bd687aed896fa64dc43d853..998bad34392cc47813fe4c48c61e9d9e9d1c7b94 100644 |
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_dbg.json |
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_win_dbg.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]", |
"--issue", |
"12853011", |
"--patchset", |
@@ -39,6 +40,7 @@ |
"--no_shallow", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -82,9 +84,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": [ |
@@ -98,9 +101,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 dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", |
+ "GYP_DEFINES": "chromium_win_pch=0 dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=ia32", |
"GYP_GENERATORS": "ninja", |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -115,6 +119,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -132,9 +137,9 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[CWD]\\v8", |
+ "[SLAVE_BUILD]\\v8", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--compiler", |
@@ -144,11 +149,12 @@ |
"--goma-service-account-json-file", |
"C:\\creds\\service_accounts\\service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]\\b\\build\\goma", |
+ "[BUILD]\\goma", |
"--goma-fail-fast", |
"--goma-disable-local-fallback", |
"--" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -163,17 +169,18 @@ |
"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\\Debug\\bot_default.isolated.gen.json", |
- "[CWD]\\v8\\out\\Debug\\ignition.isolated.gen.json", |
- "[CWD]\\v8\\out\\Debug\\mozilla.isolated.gen.json" |
+ "[SLAVE_BUILD]\\v8\\out\\Debug\\bot_default.isolated.gen.json", |
+ "[SLAVE_BUILD]\\v8\\out\\Debug\\ignition.isolated.gen.json", |
+ "[SLAVE_BUILD]\\v8\\out\\Debug\\mozilla.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -188,7 +195,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", |
@@ -269,6 +276,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@{@@@", |
@@ -295,7 +303,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", |
@@ -377,6 +385,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@{@@@", |
@@ -397,7 +406,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", |
@@ -478,6 +487,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@{@@@", |
@@ -501,9 +511,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", |
"--", |
@@ -516,6 +526,7 @@ |
"2", |
"Check/Windows-7-SP1/[dummy has/v8_win_dbg/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Check", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -541,9 +552,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", |
"--", |
@@ -556,6 +567,7 @@ |
"1", |
"Ignition - turbofan/Windows-7-SP1/[dummy has/v8_win_dbg/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Ignition - turbofan", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |
@@ -581,9 +593,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", |
"--", |
@@ -596,6 +608,7 @@ |
"1", |
"Mozilla/Windows-7-SP1/[dummy has/v8_win_dbg/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Mozilla", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@", |