| Index: scripts/slave/recipes/dart/dartium_build.expected/basic_linux_64_MirrorFalse.json
|
| diff --git a/scripts/slave/recipes/dart/dartium_build.expected/basic_linux_64_MirrorFalse.json b/scripts/slave/recipes/dart/dartium_build.expected/basic_linux_64_MirrorFalse.json
|
| index 97434e91cd851333202047e692c28fa90bd9f3d8..56b27ad6be2993d03b080ef656fbb635d28f6d69 100644
|
| --- a/scripts/slave/recipes/dart/dartium_build.expected/basic_linux_64_MirrorFalse.json
|
| +++ b/scripts/slave/recipes/dart/dartium_build.expected/basic_linux_64_MirrorFalse.json
|
| @@ -6,8 +6,9 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "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'}]"
|
| + "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'}]"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -28,6 +29,7 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -74,9 +76,10 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "component=static_library gomadir='[ROOT]/b/build/goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -97,9 +100,9 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[CWD]/src",
|
| + "[SLAVE_BUILD]/src",
|
| "--goma-cache-dir",
|
| - "[ROOT]/b/build/slave/goma_cache",
|
| + "[GOMA_CACHE]",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -109,11 +112,12 @@
|
| "--goma-service-account-json-file",
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[ROOT]/b/build/goma",
|
| + "[BUILD]/goma",
|
| "--",
|
| "All",
|
| "chromium_builder_tests"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -127,9 +131,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/dart/tools/dartium/multivm_archive.py",
|
| + "[SLAVE_BUILD]/src/dart/tools/dartium/multivm_archive.py",
|
| "12345"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "archive_build"
|
| },
|
| {
|
|
|