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 9fcbd3b07040aa6ba8b4fb31fa84425919094de6..b22508d746a8b6a997b8051102bb7a4e25993003 100644 |
--- a/recipe_modules/gclient/example.expected/tryserver.json |
+++ b/recipe_modules/gclient/example.expected/tryserver.json |
@@ -8,6 +8,7 @@ |
"--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]" |
}, |
@@ -33,6 +34,7 @@ |
"--output-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -59,6 +61,7 @@ |
"user.name", |
"local_bot" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -75,6 +78,7 @@ |
"user.email", |
"local_bot@example.com" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -87,9 +91,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': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" |
+ "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'}]" |
], |
- "cwd": "[CWD]/src/third_party", |
+ "cwd": "[SLAVE_BUILD]/src/third_party", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -99,11 +103,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py", |
+ "[BUILD]/scripts/slave/gclient_safe_revert.py", |
".", |
- "[ROOT]/b/depot_tools/gclient" |
+ "[DEPOT_TOOLS]/gclient" |
], |
- "cwd": "[CWD]/src/third_party", |
+ "cwd": "[SLAVE_BUILD]/src/third_party", |
"name": "[spec: WebKit] gclient revert" |
}, |
{ |
@@ -122,7 +126,7 @@ |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[CWD]/src/third_party", |
+ "cwd": "[SLAVE_BUILD]/src/third_party", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -147,8 +151,9 @@ |
"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", |
- "[CWD]" |
+ "[SLAVE_BUILD]" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup index.lock", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -172,6 +177,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |