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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.fyi.debug_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.expected/tsan.json ('k') | scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.py b/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.py
index ad69a8981659fc7970e0165fdd0ef680fcd065e3..8e92ea5558a26975c8c2e9eb70c330cf9c0d6eda 100644
--- a/scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.fyi.debug_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 Vista_Tests__dbg__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)
@@ -53,7 +52,7 @@ def Vista_Tests__dbg__1__steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': ' component=shared_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 Vista_Tests__dbg__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", "Debug", "--build-archive-url", build_properties[
"parent_build_archive_url"], '--build-properties=%s' %
api.json.dumps(build_properties,
@@ -69,7 +68,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"base_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -84,7 +83,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"cacheinvalidation_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -99,7 +98,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"chrome_elf_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -114,7 +113,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"components_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -129,7 +128,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"courgette_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -144,7 +143,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"crypto_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -159,7 +158,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"extensions_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -174,7 +173,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"gcm_unit_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -189,7 +188,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"google_apis_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -204,7 +203,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"gpu_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -219,7 +218,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"url_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -234,7 +233,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"jingle_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -249,7 +248,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"device_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -264,7 +263,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"media_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -279,7 +278,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"net_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -294,7 +293,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"ppapi_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -309,7 +308,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"printing_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -324,7 +323,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"remoting_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -339,7 +338,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"sbox_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -354,7 +353,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"sbox_integration_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -369,7 +368,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"sbox_validation_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -384,7 +383,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"ipc_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -399,7 +398,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"sync_unit_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -414,7 +413,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"unit_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -429,7 +428,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"skia_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -444,7 +443,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"sql_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -459,7 +458,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"ui_base_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -474,7 +473,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"content_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -489,7 +488,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"views_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -504,7 +503,7 @@ def Vista_Tests__dbg__1__steps(api):
# runtest step
api.python(
"installer_util_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -518,7 +517,7 @@ def Vista_Tests__dbg__1__steps(api):
'installer_util_unittests.exe', '--gtest_print_time'])
# process dumps step
api.python("process dumps",
- api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
+ api.path["build"].join("scripts", "slave", "process_dumps.py"),
args=["--target", "Debug"])
@@ -527,7 +526,7 @@ def Chromium_Builder__dbg__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)
@@ -559,7 +558,7 @@ def Chromium_Builder__dbg__steps(api):
'GYP_DEFINES': 'fastbuild=1 component=shared_library',
'GYP_MSVS_VERSION': '2015'}
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
@@ -570,12 +569,12 @@ def Chromium_Builder__dbg__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", "Debug", '--build-url',
'gs://chromium-build-transfer/Chromium FYI Builder (dbg)',
@@ -677,7 +676,7 @@ def Vista_Tests__dbg__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)
@@ -709,7 +708,7 @@ def Vista_Tests__dbg__2__steps(api):
'DEPOT_TOOLS_UPDATE': '0',
'GYP_DEFINES': ' component=shared_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
@@ -717,7 +716,7 @@ def Vista_Tests__dbg__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", "Debug", "--build-archive-url", build_properties[
"parent_build_archive_url"], '--build-properties=%s' %
api.json.dumps(build_properties,
@@ -725,7 +724,7 @@ def Vista_Tests__dbg__2__steps(api):
# runtest step
api.python(
"browser_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -740,7 +739,7 @@ def Vista_Tests__dbg__2__steps(api):
# runtest step
api.python(
"content_browsertests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Debug', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -754,7 +753,7 @@ def Vista_Tests__dbg__2__steps(api):
'content_browsertests.exe', '--gtest_print_time'])
# process dumps step
api.python("process dumps",
- api.infra_paths['build'].join("scripts", "slave", "process_dumps.py"),
+ api.path["build"].join("scripts", "slave", "process_dumps.py"),
args=["--target", "Debug"])
« no previous file with comments | « scripts/slave/recipes/chromium.expected/tsan.json ('k') | scripts/slave/recipes/chromium.fyi.debug_win_block.recipe_autogen.expected/Chromium_Builder__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698