Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json
diff --git a/scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json b/scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json
index 5d75e8c7fe2b441fe2930e7937c049a8e5dd18bb..1ec82fb9f7d50fc8bb78590d4894ee2c67e72349 100644
--- a/scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json
+++ b/scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build_internal/scripts/slave', 'url': 'https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave.git'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build_internal/scripts/slave', 'url': 'https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave.git'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
"--root",
"build_internal/scripts/slave",
"--revision_mapping_file",
"{\"build\": \"got_build_revision\", \"build_internal/scripts/slave\": \"got_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--issue",
"12853011",
"--patchset",
@@ -30,7 +30,6 @@
"build_internal/scripts/slave@HEAD",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -82,7 +81,7 @@
"-m",
"Committed patch"
],
- "cwd": "[SLAVE_BUILD]/build_internal/scripts/slave",
+ "cwd": "[CWD]/build_internal/scripts/slave",
"name": "commit git patch"
},
{
@@ -100,7 +99,7 @@
"--rietveld_email",
"",
"--root",
- "[SLAVE_BUILD]/build_internal/scripts/slave",
+ "[CWD]/build_internal/scripts/slave",
"--commit",
"--verbose",
"--verbose",
@@ -113,7 +112,6 @@
"--upstream",
"3faf12c8131337a86e669cc1a1bd8d2dfe8cc86d"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"PYTHONPATH": ""

Powered by Google App Engine
This is Rietveld 408576698