| 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 f434bd2a88b7552841e2c3bf3024af2eac3d0a84..4b8a00a9b6ba18da38cf214a9e571e6453e8d1ff 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,6 +6,7 @@ DEPS = [
|
| 'chromium',
|
| 'depot_tools/bot_update',
|
| 'depot_tools/gclient',
|
| + 'depot_tools/infra_paths',
|
| 'recipe_engine/json',
|
| 'recipe_engine/path',
|
| 'recipe_engine/properties',
|
| @@ -20,7 +21,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.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)
|
| @@ -52,7 +53,7 @@ def Windows_Tests__DrMemory__steps(api):
|
| 'DEPOT_TOOLS_UPDATE': '0',
|
| 'GYP_DEFINES': ' component=static_library'}
|
| api.python("gclient runhooks wrapper",
|
| - api.path["build"].join("scripts", "slave",
|
| + api.infra_paths['build'].join("scripts", "slave",
|
| "runhooks_wrapper.py"),
|
| env=env)
|
| # cleanup_temp step
|
| @@ -60,7 +61,7 @@ def Windows_Tests__DrMemory__steps(api):
|
| # extract build step
|
| api.python(
|
| "extract build",
|
| - api.path["build"].join("scripts", "slave", "extract_build.py"),
|
| + api.infra_paths['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,
|
| @@ -69,7 +70,7 @@ def Windows_Tests__DrMemory__steps(api):
|
| # runtest step
|
| api.python(
|
| "memory test: webkit",
|
| - api.path["build"].join("scripts", "slave", "runtest.py"),
|
| + api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
|
| args=
|
| ['--run-shell-script', '--target', 'Release',
|
| "--build-properties=%s" %
|
| @@ -87,7 +88,7 @@ def Windows_Tests__DrMemory__steps(api):
|
| # runtest step
|
| api.python(
|
| "memory test: webkit",
|
| - api.path["build"].join("scripts", "slave", "runtest.py"),
|
| + api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
|
| args=
|
| ['--run-shell-script', '--target', 'Release',
|
| "--build-properties=%s" %
|
| @@ -109,7 +110,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.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)
|
| @@ -141,7 +142,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
|
| 'DEPOT_TOOLS_UPDATE': '0',
|
| 'GYP_DEFINES': ' component=static_library'}
|
| api.python("gclient runhooks wrapper",
|
| - api.path["build"].join("scripts", "slave",
|
| + api.infra_paths['build'].join("scripts", "slave",
|
| "runhooks_wrapper.py"),
|
| env=env)
|
| # cleanup_temp step
|
| @@ -149,7 +150,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
|
| # extract build step
|
| api.python(
|
| "extract build",
|
| - api.path["build"].join("scripts", "slave", "extract_build.py"),
|
| + api.infra_paths['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,
|
| @@ -157,7 +158,7 @@ def Windows_Browser__DrMemory_light___1__steps(api):
|
| # runtest step
|
| api.python(
|
| "memory test: browser_tests",
|
| - api.path["build"].join("scripts", "slave", "runtest.py"),
|
| + api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
|
| args=
|
| ['--run-shell-script', '--target', 'Release', "--build-properties=%s" %
|
| api.json.dumps(build_properties,
|
| @@ -179,7 +180,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.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)
|
| @@ -211,7 +212,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.path["build"].join("scripts", "slave",
|
| + api.infra_paths['build'].join("scripts", "slave",
|
| "runhooks_wrapper.py"),
|
| env=env)
|
| # cleanup_temp step
|
| @@ -222,12 +223,12 @@ def Windows_Builder__DrMemory__steps(api):
|
| if "clobber" in api.properties:
|
| args.append("--clobber")
|
| api.python("compile",
|
| - api.path["build"].join("scripts", "slave", "compile.py"),
|
| + api.infra_paths['build'].join("scripts", "slave", "compile.py"),
|
| args=args)
|
| # zip_build step
|
| step_result = api.python(
|
| "zip build",
|
| - api.path["build"].join("scripts", "slave", "zip_build.py"),
|
| + api.infra_paths['build'].join("scripts", "slave", "zip_build.py"),
|
| args=
|
| ["--json-urls", api.json.output(),
|
| "--target", "Release", '--build-url',
|
| @@ -368,7 +369,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.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)
|
| @@ -400,7 +401,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
|
| 'DEPOT_TOOLS_UPDATE': '0',
|
| 'GYP_DEFINES': ' component=static_library'}
|
| api.python("gclient runhooks wrapper",
|
| - api.path["build"].join("scripts", "slave",
|
| + api.infra_paths['build'].join("scripts", "slave",
|
| "runhooks_wrapper.py"),
|
| env=env)
|
| # cleanup_temp step
|
| @@ -408,7 +409,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
|
| # extract build step
|
| api.python(
|
| "extract build",
|
| - api.path["build"].join("scripts", "slave", "extract_build.py"),
|
| + api.infra_paths['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,
|
| @@ -416,7 +417,7 @@ def Windows_Browser__DrMemory_light___2__steps(api):
|
| # runtest step
|
| api.python(
|
| "memory test: browser_tests",
|
| - api.path["build"].join("scripts", "slave", "runtest.py"),
|
| + api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
|
| args=
|
| ['--run-shell-script', '--target', 'Release', "--build-properties=%s" %
|
| api.json.dumps(build_properties,
|
|
|