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

Issues Search
    My Issues | Starred     Open | Closed | All

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

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/chromium.fyi.debug_win_block.recipe_autogen.expected/Vista_Tests__dbg__2_.json ('k') | scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.py b/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.py
index 4b8a00a9b6ba18da38cf214a9e571e6453e8d1ff..f434bd2a88b7552841e2c3bf3024af2eac3d0a84 100644
--- a/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.py
@@ -6,7 +6,6 @@ DEPS = [
'chromium',
'depot_tools/bot_update',
'depot_tools/gclient',
- 'depot_tools/infra_paths',
'recipe_engine/json',
'recipe_engine/path',
'recipe_engine/properties',
@@ -21,7 +20,7 @@ def Windows_Tests__DrMemory__steps(api):
# svnkill step; not necessary in recipes
# update scripts step; implicitly run by recipe engine.
# taskkill step
- api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+ api.python("taskkill", api.path["build"].join("scripts", "slave",
"kill_processes.py"))
# bot_update step
src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -53,7 +52,7 @@ def Windows_Tests__DrMemory__steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': ' component=static_library'}
api.python("gclient runhooks wrapper",
- api.infra_paths['build'].join("scripts", "slave",
+ api.path["build"].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -61,7 +60,7 @@ def Windows_Tests__DrMemory__steps(api):
# extract build step
api.python(
"extract build",
- api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+ api.path["build"].join("scripts", "slave", "extract_build.py"),
args=["--target", "Release", "--build-archive-url", build_properties[
"parent_build_archive_url"], '--build-properties=%s' %
api.json.dumps(build_properties,
@@ -70,7 +69,7 @@ def Windows_Tests__DrMemory__steps(api):
# runtest step
api.python(
"memory test: webkit",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--run-shell-script', '--target', 'Release',
"--build-properties=%s" %
@@ -88,7 +87,7 @@ def Windows_Tests__DrMemory__steps(api):
# runtest step
api.python(
"memory test: webkit",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--run-shell-script', '--target', 'Release',
"--build-properties=%s" %
@@ -110,7 +109,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
# svnkill step; not necessary in recipes
# update scripts step; implicitly run by recipe engine.
# taskkill step
- api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+ api.python("taskkill", api.path["build"].join("scripts", "slave",
"kill_processes.py"))
# bot_update step
src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -142,7 +141,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': ' component=static_library'}
api.python("gclient runhooks wrapper",
- api.infra_paths['build'].join("scripts", "slave",
+ api.path["build"].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -150,7 +149,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
# extract build step
api.python(
"extract build",
- api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+ api.path["build"].join("scripts", "slave", "extract_build.py"),
args=["--target", "Release", "--build-archive-url", build_properties[
"parent_build_archive_url"], '--build-properties=%s' %
api.json.dumps(build_properties,
@@ -158,7 +157,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
# runtest step
api.python(
"memory test: browser_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--run-shell-script', '--target', 'Release', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -180,7 +179,7 @@ def Windows_Builder__DrMemory__steps(api):
# svnkill step; not necessary in recipes
# update scripts step; implicitly run by recipe engine.
# taskkill step
- api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+ api.python("taskkill", api.path["build"].join("scripts", "slave",
"kill_processes.py"))
# bot_update step
src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -212,7 +211,7 @@ def Windows_Builder__DrMemory__steps(api):
'GYP_DEFINES': 'build_for_tool=drmemory component=shared_library',
'LANDMINES_VERBOSE': '1'}
api.python("gclient runhooks wrapper",
- api.infra_paths['build'].join("scripts", "slave",
+ api.path["build"].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -223,12 +222,12 @@ def Windows_Builder__DrMemory__steps(api):
if "clobber" in api.properties:
args.append("--clobber")
api.python("compile",
- api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+ api.path["build"].join("scripts", "slave", "compile.py"),
args=args)
# zip_build step
step_result = api.python(
"zip build",
- api.infra_paths['build'].join("scripts", "slave", "zip_build.py"),
+ api.path["build"].join("scripts", "slave", "zip_build.py"),
args=
["--json-urls", api.json.output(),
"--target", "Release", '--build-url',
@@ -369,7 +368,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
# svnkill step; not necessary in recipes
# update scripts step; implicitly run by recipe engine.
# taskkill step
- api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+ api.python("taskkill", api.path["build"].join("scripts", "slave",
"kill_processes.py"))
# bot_update step
src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ -401,7 +400,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': ' component=static_library'}
api.python("gclient runhooks wrapper",
- api.infra_paths['build'].join("scripts", "slave",
+ api.path["build"].join("scripts", "slave",
"runhooks_wrapper.py"),
env=env)
# cleanup_temp step
@@ -409,7 +408,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
# extract build step
api.python(
"extract build",
- api.infra_paths['build'].join("scripts", "slave", "extract_build.py"),
+ api.path["build"].join("scripts", "slave", "extract_build.py"),
args=["--target", "Release", "--build-archive-url", build_properties[
"parent_build_archive_url"], '--build-properties=%s' %
api.json.dumps(build_properties,
@@ -417,7 +416,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
# runtest step
api.python(
"memory test: browser_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--run-shell-script', '--target', 'Release', "--build-properties=%s" %
api.json.dumps(build_properties,
« no previous file with comments | « scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Vista_Tests__dbg__2_.json ('k') | scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698