Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin64_dbg_.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin64_dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin64_dbg_.json |
index eccd4e4be817bdc6566ce8bb6da62f77c0c266c5..30b8956d3cfe197dc76e373d2bb04b34f89882c7 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin64_dbg_.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin64_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': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
"--git-cache-dir", |
- "[ROOT]\\b\\build\\slave\\cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -33,6 +34,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -108,9 +110,10 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\tools\\swarming_client\\swarming.py", |
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py", |
"--version" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "swarming.py --version", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -124,6 +127,7 @@ |
"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": "clang=1 component=shared_library fastbuild=1 target_arch=x64 test_isolation_mode=prepare", |
@@ -136,17 +140,18 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\testing\\scripts\\get_compile_targets.py", |
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
"Debug_x64", |
"--paths", |
- "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}", |
+ "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}", |
"--properties", |
"{\"buildername\": \"ClangToTWin64(dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
@@ -158,12 +163,13 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[CWD]\\src\\testing\\buildbot\\chromium.fyi.json", |
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read test spec", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.fyi.json@@@", |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"ClangToTWin64(dbg) tester\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@", |
@@ -188,6 +194,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -196,9 +203,10 @@ |
"-u", |
"RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py", |
"--build-dir", |
- "[CWD]\\src\\out\\Debug_x64", |
+ "[SLAVE_BUILD]\\src\\out\\Debug_x64", |
"--clean-isolated-files" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "clean isolated files" |
}, |
{ |
@@ -208,10 +216,11 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--output-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
"LLVM_FORCE_HEAD_REVISION": "YES" |
@@ -239,9 +248,9 @@ |
"--target", |
"Debug_x64", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--build-data-dir", |
@@ -251,6 +260,7 @@ |
"--", |
"all" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
"LLVM_FORCE_HEAD_REVISION": "YES" |
@@ -263,11 +273,11 @@ |
"-u", |
"RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py", |
"--build-dir", |
- "[CWD]\\src\\out\\Debug_x64", |
+ "[SLAVE_BUILD]\\src\\out\\Debug_x64", |
"--src-dir", |
- "[CWD]\\src" |
+ "[SLAVE_BUILD]\\src" |
], |
- "cwd": "[CWD]", |
+ "cwd": "[SLAVE_BUILD]", |
"name": "remove_build_metadata" |
}, |
{ |
@@ -275,15 +285,16 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]\\resources\\isolate.py", |
- "[CWD]\\src\\tools\\swarming_client", |
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[CWD]\\src\\out\\Debug_x64\\browser_tests.isolated.gen.json" |
+ "[SLAVE_BUILD]\\src\\out\\Debug_x64\\browser_tests.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -312,10 +323,12 @@ |
"--build-properties", |
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"ClangToTWin64(dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "package build" |
}, |
{ |
"cmd": [], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "trigger", |
"trigger_specs": [ |
{ |
@@ -369,6 +382,7 @@ |
"--platform", |
"win" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "sizes" |
}, |
{ |
@@ -379,6 +393,7 @@ |
"--target", |
"Debug_x64" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "process_dumps" |
}, |
{ |