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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.fyi.win_misc_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.win_block.recipe_autogen.expected/Win8_Tests__2_.json ('k') | scripts/slave/recipes/chromium.fyi.win_misc_block.recipe_autogen.expected/Chromium_Win_x64_Clobber.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.fyi.win_misc_block.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.fyi.win_misc_block.recipe_autogen.py b/scripts/slave/recipes/chromium.fyi.win_misc_block.recipe_autogen.py
index 76055ca50a29c9213645ebd172a382340f9ed271..11f57a86c746ae158a0c20d449ab46aaa7912678 100644
--- a/scripts/slave/recipes/chromium.fyi.win_misc_block.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.fyi.win_misc_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',
@@ -20,7 +19,7 @@ def Chromium_Win_x64_Clobber_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)
@@ -52,7 +51,7 @@ def Chromium_Win_x64_Clobber_steps(api):
'GYP_DEFINES': 'target_arch=x64 component=static_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
@@ -61,13 +60,13 @@ def Chromium_Win_x64_Clobber_steps(api):
args = ['--solution', 'out.sln', '--target', 'Release_x64', '--clobber',
'--build-tool=ninja', '--', 'chromium_builder_tests']
api.python("compile",
- api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+ api.path["build"].join("scripts", "slave", "compile.py"),
args=args)
with api.step.defer_results():
# runtest step
api.python(
"interactive_ui_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -81,7 +80,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -95,7 +94,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -109,7 +108,7 @@ def Chromium_Win_x64_Clobber_steps(api):
# runtest step
api.python(
"cc_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -123,7 +122,7 @@ def Chromium_Win_x64_Clobber_steps(api):
# runtest step
api.python(
"chromedriver_unittests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -137,7 +136,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -151,7 +150,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -165,7 +164,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -179,7 +178,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -193,7 +192,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -207,7 +206,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -221,7 +220,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -235,7 +234,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -249,7 +248,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -263,7 +262,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -277,7 +276,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -291,7 +290,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -305,7 +304,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -319,7 +318,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -333,7 +332,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -347,7 +346,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -361,7 +360,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -375,7 +374,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -389,7 +388,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -403,7 +402,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -417,7 +416,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -431,7 +430,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -445,7 +444,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -459,7 +458,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -473,7 +472,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -487,7 +486,7 @@ def Chromium_Win_x64_Clobber_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', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -501,7 +500,7 @@ def Chromium_Win_x64_Clobber_steps(api):
# runtest step
api.python(
"sync_integration_tests",
- api.infra_paths['build'].join("scripts", "slave", "runtest.py"),
+ api.path["build"].join("scripts", "slave", "runtest.py"),
args=
['--target', 'Release_x64', "--build-properties=%s" %
api.json.dumps(build_properties,
@@ -515,12 +514,12 @@ def Chromium_Win_x64_Clobber_steps(api):
'--gtest_print_time'])
# nacl_integration step
api.python("nacl_integration",
- api.infra_paths['slave_build'].join(
- 'src', 'chrome', 'test', 'nacl_test_injection',
- 'buildbot_nacl_integration.py'),
+ api.path["slave_build"].join('src', 'chrome', 'test',
+ 'nacl_test_injection',
+ 'buildbot_nacl_integration.py'),
args=['--mode', 'Release_x64'],
env={},
- cwd=api.infra_paths['slave_build'])
+ cwd=api.path["slave_build"])
def Windows_8_App_Certification_steps(api):
@@ -528,7 +527,7 @@ def Windows_8_App_Certification_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 Windows_8_App_Certification_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
@@ -569,7 +568,7 @@ def Windows_8_App_Certification_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)
« no previous file with comments | « scripts/slave/recipes/chromium.fyi.win_block.recipe_autogen.expected/Win8_Tests__2_.json ('k') | scripts/slave/recipes/chromium.fyi.win_misc_block.recipe_autogen.expected/Chromium_Win_x64_Clobber.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698