| Index: recipe_modules/gclient/example.expected/tryserver.json
|
| diff --git a/recipe_modules/gclient/example.expected/tryserver.json b/recipe_modules/gclient/example.expected/tryserver.json
|
| index b22508d746a8b6a997b8051102bb7a4e25993003..9fcbd3b07040aa6ba8b4fb31fa84425919094de6 100644
|
| --- a/recipe_modules/gclient/example.expected/tryserver.json
|
| +++ b/recipe_modules/gclient/example.expected/tryserver.json
|
| @@ -8,7 +8,6 @@
|
| "--spec",
|
| "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -34,7 +33,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -61,7 +59,6 @@
|
| "user.name",
|
| "local_bot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -78,7 +75,6 @@
|
| "user.email",
|
| "local_bot@example.com"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -91,9 +87,9 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]"
|
| + "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src/third_party",
|
| + "cwd": "[CWD]/src/third_party",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -103,11 +99,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/gclient_safe_revert.py",
|
| + "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py",
|
| ".",
|
| - "[DEPOT_TOOLS]/gclient"
|
| + "[ROOT]/b/depot_tools/gclient"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src/third_party",
|
| + "cwd": "[CWD]/src/third_party",
|
| "name": "[spec: WebKit] gclient revert"
|
| },
|
| {
|
| @@ -126,7 +122,7 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src/third_party",
|
| + "cwd": "[CWD]/src/third_party",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -151,9 +147,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
|
| - "[SLAVE_BUILD]"
|
| + "[CWD]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup index.lock",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -177,7 +172,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
|
|