scripts/slave/recipes/run_presubmit.expected/catapult.json - Issue 1919193002: build: roll infra_paths changes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipes/run_presubmit.expected/catapult.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

« no previous file with comments | « scripts/slave/recipes/run_presubmit.expected/build_internal_scripts_slave.json ('k') | scripts/slave/recipes/run_presubmit.expected/chrome_golo.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/run_presubmit.expected/catapult.json

diff --git a/scripts/slave/recipes/run_presubmit.expected/catapult.json b/scripts/slave/recipes/run_presubmit.expected/catapult.json

index aa2bb0c9640782b4b7a8e2c7042bc96bc581b8f0..daf222b87e433d94a2f2064b27264343bd28e246 100644

--- a/scripts/slave/recipes/run_presubmit.expected/catapult.json

+++ b/scripts/slave/recipes/run_presubmit.expected/catapult.json

@@ -11,13 +11,13 @@

"--slave",

"TestSlavename",

"--spec",

- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'catapult', 'url': 'https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git'}]",

+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'catapult', 'url': 'https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git'}]",

"--root",

"catapult",

"--revision_mapping_file",

"{\"catapult\": \"got_revision\"}",

"--git-cache-dir",

- "[GIT_CACHE]",

+ "[ROOT]/b/build/slave/cache_dir",

"--issue",

"12853011",

"--patchset",

@@ -30,7 +30,6 @@

"catapult@HEAD",

"--output_manifest"

- "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -74,7 +73,7 @@

"-m",

"Committed patch"

- "cwd": "[SLAVE_BUILD]/catapult",

+ "cwd": "[CWD]/catapult",

"name": "commit git patch"

{

@@ -92,7 +91,7 @@

"--rietveld_email",

"",

"--root",

- "[SLAVE_BUILD]/catapult",

+ "[CWD]/catapult",

"--commit",

"--verbose",

@@ -105,7 +104,6 @@

"--upstream",

"c812fca9479aacda33f5f5a74d588acef2b4fb02"

- "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"