Index: scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer.json |
diff --git a/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer.json b/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer.json |
index 4e797450638db5520e3f0d46657ab3df094bd5b7..355cb9247be68a9f7f32c0c36db0d24fe46082ea 100644 |
--- a/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer.json |
+++ b/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-outer.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]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,6 +25,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -61,12 +62,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\", \"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\", \"slavename\": \"TestSlavename\"}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "actual run" |
}, |
{ |