scripts/slave/recipes/nacl_ports.expected/linux.json - Issue 1917243002: Revert "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/nacl_ports.expected/linux.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: 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/nacl/sdk_build.expected/basic.json ('k') | scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/nacl_ports.expected/linux.json

diff --git a/scripts/slave/recipes/nacl_ports.expected/linux.json b/scripts/slave/recipes/nacl_ports.expected/linux.json

index a0542eb5b82043e795237d7f366d86d4b70fe5e1..f5c31eaa78f9d9c223cc8d43370b35f8f3629ba3 100644

--- a/scripts/slave/recipes/nacl_ports.expected/linux.json

+++ b/scripts/slave/recipes/nacl_ports.expected/linux.json

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

"--slave",

"TestSlave",

"--spec",

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

+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/webports.git'}]",

"--root",

"src",

"--revision_mapping_file",

"{\"src\": \"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]"

@@ -63,6 +64,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -71,9 +73,9 @@

{

"allow_subannotations": true,

"cmd": [

- "[CWD]/src/build_tools/buildbot_selector.sh"

+ "[SLAVE_BUILD]/src/build_tools/buildbot_selector.sh"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"env": {

"BUILDBOT_BUILDERNAME": "linux-glibc-0",

"BUILDBOT_GOT_REVISION": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",