| Index: scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_clobber.json
|
| diff --git a/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_clobber.json b/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_clobber.json
|
| index 510c35162cade82be6bb6814f38350dbbccfea7b..82d06d96d4a78e4ba8760dee4b9f3f0850b461f9 100644
|
| --- a/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_clobber.json
|
| +++ b/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_clobber.json
|
| @@ -3,9 +3,8 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/kill_processes.py"
|
| + "[ROOT]/b/build/scripts/slave/kill_processes.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "taskkill"
|
| },
|
| {
|
| @@ -20,13 +19,13 @@
|
| "--slave",
|
| "TestSlave",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
|
| + "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]/b/build/slave/cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -34,7 +33,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -94,9 +92,8 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runhooks_wrapper.py"
|
| + "[ROOT]/b/build/scripts/slave/runhooks_wrapper.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_GYP_SYNTAX_CHECK": "1",
|
| "DEPOT_TOOLS_UPDATE": "0",
|
| @@ -115,14 +112,13 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| + "[ROOT]/b/build/scripts/slave/compile.py",
|
| "--solution",
|
| "all.sln",
|
| "--project",
|
| @@ -132,14 +128,13 @@
|
| "--compiler=goma",
|
| "--clobber"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "compile"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/zip_build.py",
|
| + "[ROOT]/b/build/scripts/slave/zip_build.py",
|
| "--json-urls",
|
| "/path/to/tmp/json",
|
| "--target",
|
| @@ -149,7 +144,6 @@
|
| "--build-properties={\"buildername\":\"Chromium Builder (dbg)\",\"buildnumber\":\"42\",\"clobber\":\"\",\"got_revision\":\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\",\"got_revision_cp\":\"refs/heads/master@{#170242}\",\"got_swarming_client_revision\":\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\",\"got_swarming_client_revision_cp\":\"refs/heads/master@{#276089}\",\"got_v8_revision\":\"801ada225ddc271c132c3a35f03975671d43e399\",\"got_v8_revision_cp\":\"refs/heads/master@{#43426}\",\"got_webkit_revision\":\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\",\"got_webkit_revision_cp\":\"refs/heads/master@{#124383}\",\"mastername\":\"chromium.fyi\",\"recipe\":\"chromium.fyi.debug_win_block.recipe_autogen\",\"revision\":\"123456789abcdef\",\"slavename\":\"TestSlave\"}",
|
| "--factory-properties={\"blink_config\":\"chromium\",\"gclient_env\":{\"CHROMIUM_GYP_SYNTAX_CHECK\":\"1\",\"DEPOT_TOOLS_UPDATE\":\"0\",\"GYP_DEFINES\":\"fastbuild=1 component=shared_library\",\"GYP_MSVS_VERSION\":\"2015\",\"LANDMINES_VERBOSE\":\"1\"},\"trigger\":\"win_dbg\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "zip build",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -162,7 +156,6 @@
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "trigger",
|
| "trigger_specs": [
|
| {
|
|
|