scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.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/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.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/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json ('k') | scripts/slave/recipes/skia/swarm_compile.expected/Build-Win-MSVC-x86-Debug-VS2015.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json

diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json

index b39477d97cfc05a69717cf469fd3d43f175cfbdb..134793cdd48eca68768e59f621d70e71c1ac4cf1 100644

--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json

+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json

@@ -3,11 +3,11 @@

"cmd": [

"python",

"-u",

- "[CWD]/skia/tools/buildbot_spec.py",

+ "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",

"/path/to/tmp/json",

"Build-Ubuntu-GCC-x86_64-Release-Valgrind"

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

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

"name": "exec buildbot_spec.py",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{@@@",

@@ -46,14 +46,14 @@

"make",

"most"

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

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

"env": {

"BUILDTYPE": "Release",

"CHROME_HEADLESS": "1",

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

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

"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=1",

- "PATH": "[CWD]/depot_tools:%(PATH)s",

- "SKIA_OUT": "[CWD]/out"

+ "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",

+ "SKIA_OUT": "[SLAVE_BUILD]/out"

"name": "build most"

@@ -62,9 +62,10 @@

"python",

"-u",

"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n print 'Copying build product %s to %s' % (f, dst)\n shutil.move(f, dst)\n",

- "[CWD]/out/Release",

+ "[SLAVE_BUILD]/out/Release",

"[SWARM_OUT_DIR]/out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "copy build products",

"~followup_annotations": [

"@@@STEP_LOG_LINE@python.inline@import errno@@@",