scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.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/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.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/client.dynamorio.recipe_autogen.expected/win_xp_dr.json ('k') | scripts/slave/recipes/client.fletch.recipe_autogen.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.json

diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.json b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.json

index 9a872ebbe94dc14d50744025126e6c1f53da0fd9..cf7411955ef1ea97c82aad5f4dedd6de16776667 100644

--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.json

+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/win_xp_dr_nightly.json

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

"--slave",

"TestSlave",

"--spec",

- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'dynamorio/tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",

+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'dynamorio/tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",

"--root",

"dynamorio",

"--revision_mapping_file",

"{}",

"--git-cache-dir",

- "[GIT_CACHE]",

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

"--output_json",

"/path/to/tmp/json",

"--revision",

@@ -25,7 +25,6 @@

"--force",

"--output_manifest"

- "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -49,14 +48,14 @@

{

"cmd": [

- "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools/unpack.bat"

+ "[CWD]/dynamorio/tools/buildbot/bot_tools/unpack.bat"

- "cwd": "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools",

+ "cwd": "[CWD]/dynamorio/tools/buildbot/bot_tools",

"name": "unpack tools"

{

"cmd": [

- "[BUILD]/scripts/slave/drmemory/build_env.bat",

+ "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",

"ctest",

"--timeout",

"120",

@@ -64,9 +63,9 @@

"-S",

"dynamorio/suite/runsuite.cmake,nightly;long;site=X64.WindowsXp.VS2010.BuildBot"

- "cwd": "[SLAVE_BUILD]",

+ "cwd": "[CWD]",

"env": {

- "BOTTOOLS": "[SLAVE_BUILD]/dynamorio/tools/buildbot/bot_tools"

+ "BOTTOOLS": "[CWD]/dynamorio/tools/buildbot/bot_tools"

"name": "nightly suite"