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

Unified Diff: scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.py

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
Index: scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.py b/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.py
index 0ee1caed6ceb876d61affc32ed8a431dd1da3300..f6102a06a37bc793c869fb78b2ca708dde8ab6f2 100644
--- a/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.gpu.fyi.recipe_autogen.py
@@ -6,6 +6,7 @@ DEPS = [
'depot_tools/bot_update',
'chromium',
'depot_tools/gclient',
+ 'depot_tools/infra_paths',
'recipe_engine/json',
'recipe_engine/path',
'recipe_engine/properties',
@@ -18,7 +19,7 @@ def Win7_Audio_steps(api):
# svnkill step; not necessary in recipes
# update scripts step; implicitly run by recipe engine.
# taskkill step
- api.python("taskkill", api.path["build"].join("scripts", "slave",
+ api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
"kill_processes.py"))
# bot_update step
src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -58,7 +59,7 @@ def Win7_Audio_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': 'fastbuild=1 component=static_library'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave", "runhooks_wrapper.py"),
+ api.infra_paths['build'].join("scripts", "slave", "runhooks_wrapper.py"),
env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
@@ -69,10 +70,10 @@ def Win7_Audio_steps(api):
if 'clobber' in api.properties:
args.append("--clobber")
api.step("compile", ["python_slave",
- api.path["build"].join("scripts", "slave", "compile.py")] + args)
+ api.infra_paths['build'].join("scripts", "slave", "compile.py")] + args)
# runtest step
api.step("content_unittests",
- ["python_slave", api.path["build"].join("scripts", "slave", "runtest.py"),
+ ["python_slave", api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
'--target', 'Release',
"--build-properties=%s" % api.json.dumps(build_properties,
separators=(',', ':')),
@@ -87,7 +88,7 @@ def Win7_Audio_steps(api):
'--gtest_print_time'])
# runtest step
api.step("media_unittests",
- ["python_slave", api.path["build"].join("scripts", "slave", "runtest.py"),
+ ["python_slave", api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
'--target', 'Release',
"--build-properties=%s" % api.json.dumps(build_properties,
separators=(',', ':')),
@@ -144,7 +145,7 @@ def Linux_Audio_steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': ' component=static_library'}
api.python("gclient runhooks wrapper",
- api.path["build"].join("scripts", "slave", "runhooks_wrapper.py"),
+ api.infra_paths['build'].join("scripts", "slave", "runhooks_wrapper.py"),
env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
@@ -155,10 +156,10 @@ def Linux_Audio_steps(api):
if 'clobber' in api.properties:
args.append("--clobber")
api.python("compile",
- api.path["build"].join("scripts", "slave", "compile.py"), args=args)
+ api.infra_paths['build'].join("scripts", "slave", "compile.py"), args=args)
# runtest step
api.python("content_unittests",
- api.path["build"].join("scripts", "slave","runtest.py"),
+ api.infra_paths['build'].join("scripts", "slave","runtest.py"),
args=['--target', 'Release',
"--build-properties=%s" % api.json.dumps(build_properties,
separators=(',', ':')),
@@ -173,7 +174,7 @@ def Linux_Audio_steps(api):
'--gtest_print_time'])
# runtest step
api.python("media_unittests",
- api.path["build"].join("scripts", "slave","runtest.py"),
+ api.infra_paths['build'].join("scripts", "slave","runtest.py"),
args=['--target', 'Release',
"--build-properties=%s" % api.json.dumps(build_properties,
separators=(',', ':')),

Powered by Google App Engine
This is Rietveld 408576698