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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/client.dynamorio.recipe_autogen.py

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
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
« scripts/slave/recipes/chromium_trybot.py ('K') | « scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json ('k') | scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json » ('j') | scripts/slave/recipes/client.fletch.recipe_autogen.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/client.dynamorio.recipe_autogen.py
diff --git a/scripts/slave/recipes/client.dynamorio.recipe_autogen.py b/scripts/slave/recipes/client.dynamorio.recipe_autogen.py
index ecc26a6725d52e0add7dd3a6496933edecc31c57..b151b5a0b89b980e9b5a298d405e7b6a1fa96dbb 100644
--- a/scripts/slave/recipes/client.dynamorio.recipe_autogen.py
+++ b/scripts/slave/recipes/client.dynamorio.recipe_autogen.py
@@ -5,6 +5,7 @@
DEPS = [
'depot_tools/bot_update',
'depot_tools/gclient',
+ 'depot_tools/infra_paths',
'gsutil',
'recipe_engine/path',
'recipe_engine/properties',
@@ -29,12 +30,12 @@ def win_xp_dr_nightly_steps(api):
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# dynamorio win nightly suite step
api.step("nightly suite",
- [api.path["build"].join("scripts", "slave", "drmemory", "build_env.bat"),
+ [api.infra_paths['build'].join("scripts", "slave", "drmemory", "build_env.bat"),
'ctest', '--timeout', '120', '-VV', '-S',
'dynamorio/suite/runsuite.cmake,nightly;long;'+\
'site=X64.WindowsXp.VS2010.BuildBot'],
env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
- "bot_tools")}, cwd=api.path["slave_build"])
+ "bot_tools")}, cwd=api.infra_paths['slave_build'])
def linux_dr_steps(api):
@@ -50,9 +51,9 @@ def linux_dr_steps(api):
# pre-commit suite step
api.step("pre-commit suite", ['ctest', '--timeout', '120', '-VV', '-S',
api.path["checkout"].join("suite", "runsuite.cmake")],
- cwd=api.path["slave_build"], ok_ret="all")
+ cwd=api.infra_paths['slave_build'], ok_ret="all")
# upload dynamorio docs step
- api.gsutil.upload(api.path["slave_build"].join("install", "docs", "html"),
+ api.gsutil.upload(api.infra_paths['slave_build'].join("install", "docs", "html"),
Sergiy Byelozyorov 2016/04/26 14:41:05 nit: long line
"chromium-dynamorio", "dr_docs/", ["-r"], multithreaded=True)
@@ -73,11 +74,11 @@ def win_7_dr_steps(api):
'bot_tools', 'unpack.bat')], env={},
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# build_env step
- api.step("pre-commit suite", [api.path["build"].join("scripts", "slave",
+ api.step("pre-commit suite", [api.infra_paths['build'].join("scripts", "slave",
Sergiy Byelozyorov 2016/04/26 14:41:05 nit: long line
"drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
api.path["checkout"].join("suite", "runsuite.cmake")],
env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
- "bot_tools")}, cwd=api.path["slave_build"])
+ "bot_tools")}, cwd=api.infra_paths['slave_build'])
def linux_dr_package_steps(api):
@@ -120,11 +121,11 @@ def win_8_dr_steps(api):
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# build_env step
api.step("pre-commit suite",
- [api.path["build"].join("scripts", "slave", "drmemory", "build_env.bat"),
+ [api.infra_paths['build'].join("scripts", "slave", "drmemory", "build_env.bat"),
Sergiy Byelozyorov 2016/04/26 14:41:05 nit: long line
'ctest', '--timeout', '120', '-VV', '-S',
api.path["checkout"].join("suite", "runsuite.cmake")],
env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
- "bot_tools")}, cwd=api.path["slave_build"])
+ "bot_tools")}, cwd=api.infra_paths['slave_build'])
def win_xp_dr_steps(api):
@@ -144,11 +145,11 @@ def win_xp_dr_steps(api):
'bot_tools', 'unpack.bat')], env={},
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# build_env step
- api.step("pre-commit suite", [api.path["build"].join("scripts", "slave",
+ api.step("pre-commit suite", [api.infra_paths['build'].join("scripts", "slave",
Sergiy Byelozyorov 2016/04/26 14:41:05 nit: long line
"drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
api.path["checkout"].join("suite", "runsuite.cmake")],
env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
- "bot_tools")}, cwd=api.path["slave_build"])
+ "bot_tools")}, cwd=api.infra_paths['slave_build'])
def win_7_dr_nightly_steps(api):
@@ -168,12 +169,12 @@ def win_7_dr_nightly_steps(api):
'bot_tools', 'unpack.bat')], env={},
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# dynamorio win nightly suite step
- api.step("nightly suite", [api.path["build"].join("scripts", "slave",
+ api.step("nightly suite", [api.infra_paths['build'].join("scripts", "slave",
"drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
'dynamorio/suite/runsuite.cmake,nightly;long;'+\
'site=X64.Windows7.VS2010.BuildBot'],
env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
- "bot_tools")}, cwd=api.path["slave_build"])
+ "bot_tools")}, cwd=api.infra_paths['slave_build'])
def win_8_dr_nightly_steps(api):
@@ -193,12 +194,12 @@ def win_8_dr_nightly_steps(api):
'bot_tools', 'unpack.bat')], env={},
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# dynamorio win nightly suite step
- api.step("nightly suite", [api.path["build"].join("scripts", "slave",
+ api.step("nightly suite", [api.infra_paths['build'].join("scripts", "slave",
"drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
'dynamorio/suite/runsuite.cmake,nightly;long;'+\
'site=X64.Windows8.VS2010.BuildBot'],
env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
- "bot_tools")}, cwd=api.path["slave_build"])
+ "bot_tools")}, cwd=api.infra_paths['slave_build'])
def win_dr_package_steps(api):
@@ -219,7 +220,7 @@ def win_dr_package_steps(api):
cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
# get buildnumber step; no longer needed
# Package DynamoRIO step
- api.step("Package DynamoRIO", [api.path["build"].join("scripts", "slave",
+ api.step("Package DynamoRIO", [api.infra_paths['build'].join("scripts", "slave",
Sergiy Byelozyorov 2016/04/26 14:41:05 nit: long line
"drmemory", "build_env.bat"), "ctest", "-VV", "-S",
str(api.path["checkout"].join("make", "package.cmake")) + ",build=0x" +
build_properties["got_revision"][:7]],
« scripts/slave/recipes/chromium_trybot.py ('K') | « scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json ('k') | scripts/slave/recipes/client.dynamorio.recipe_autogen.expected/linux_dr.json » ('j') | scripts/slave/recipes/client.fletch.recipe_autogen.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698