Index: scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer-patch-rietveld.json |
diff --git a/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer-patch-rietveld.json b/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer-patch-rietveld.json |
index bf9c39269bf9806869236a11a5bb6f3160f06d61..032eb914ff05179e21525db620c2ad0398e4b44c 100644 |
--- a/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer-patch-rietveld.json |
+++ b/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer-patch-rietveld.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]", |
"--root", |
"build", |
"--revision_mapping_file", |
"{\"build\": \"got_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--issue", |
"12853011", |
"--patchset", |
@@ -31,6 +31,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -67,12 +68,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/build/scripts/tools/run_recipe.py", |
+ "[SLAVE_BUILD]/build/scripts/tools/run_recipe.py", |
"infra/cipd_test", |
"--master-overrides-slave", |
"--properties-file", |
- "{\"buildername\": \"cipd-module-tester\", \"buildnumber\": 571, \"dir_to_package\": \"[CWD]/build/scripts/slave/recipe_modules/cipd\", \"mastername\": \"chromium.infra\", \"revision_tag\": \"80754af91bfb6d1073585b046fe0a474ce868509/12853011_1\", \"slavename\": \"TestSlavename\"}" |
+ "{\"buildername\": \"cipd-module-tester\", \"buildnumber\": 571, \"dir_to_package\": \"[SLAVE_BUILD]/build/scripts/slave/recipe_modules/cipd\", \"mastername\": \"chromium.infra\", \"revision_tag\": \"80754af91bfb6d1073585b046fe0a474ce868509/12853011_1\", \"slavename\": \"TestSlavename\"}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "actual run" |
}, |
{ |