| Index: scripts/slave/recipes/dart/dartium_build.expected/basic_win_64_MirrorFalse.json
|
| diff --git a/scripts/slave/recipes/dart/dartium_build.expected/basic_win_64_MirrorFalse.json b/scripts/slave/recipes/dart/dartium_build.expected/basic_win_64_MirrorFalse.json
|
| index d45b2f108d925978517cd705b61028eeb3b7b6c4..9ed6eef3cf0df6a7f4082dc614d237c002a47d98 100644
|
| --- a/scripts/slave/recipes/dart/dartium_build.expected/basic_win_64_MirrorFalse.json
|
| +++ b/scripts/slave/recipes/dart/dartium_build.expected/basic_win_64_MirrorFalse.json
|
| @@ -6,9 +6,8 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'dartium.deps', 'url': 'https://dart.googlecode.com/svn/branches/bleeding_edge/deps/dartium.deps'}]"
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'dartium.deps', 'url': 'https://dart.googlecode.com/svn/branches/bleeding_edge/deps/dartium.deps'}]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -29,7 +28,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -76,10 +74,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 component=static_library fastbuild=1 gomadir='[BUILD]\\goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -100,9 +97,9 @@
|
| "--target",
|
| "Release_x64",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -112,12 +109,11 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[ROOT]\\b\\build\\goma",
|
| "--",
|
| "All",
|
| "chromium_builder_tests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -131,10 +127,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\dart\\tools\\dartium\\multivm_archive.py",
|
| + "[CWD]\\src\\dart\\tools\\dartium\\multivm_archive.py",
|
| "12345"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "archive_build"
|
| },
|
| {
|
|
|