build: roll infra_paths changes

scripts/slave/recipes/client.fletch.recipe_autogen.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
+  'depot_tools/infra_paths',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/step',
   'trigger',
 ]
 
 def target_dartino_linux_debug_arm_dev_steps(api):
   build_properties = api.properties.legacy()
   # update scripts step; implicitly run by recipe engine.
   # bot_update step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "sdk"
   soln.url = "https://github.com/dartino/sdk.git"
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",

[Sergiy Byelozyorov, 2016/04/26 14:41:06]

nit: long line

     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party',
       'java', 'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 19 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",

[Sergiy Byelozyorov, 2016/04/26 14:41:06]

I'd recommend keeping double quotes where they are used everywhere else in the
file

     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 22 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 22 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
       'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
     cwd=api.path["checkout"])
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
 
 
 def dartino_win_debug_x86_steps(api):
   build_properties = api.properties.legacy()
   # 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)
   soln = src_cfg.solutions.add()
   soln.name = "sdk"
   soln.url = "https://github.com/dartino/sdk.git"
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.step("annotated steps", ["python_slave",
     api.path["checkout"].join("tools", "bots", "dartino.py")],
     allow_subannotations=True, env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 21 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 21 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"], env={},
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 15 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
@@ skipping 18 matching lines @@
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
   # dartino annotated steps step
   api.python("annotated steps", api.path["checkout"].join("tools", "bots",
     "dartino.py"), allow_subannotations=True,
     env={'BUILDBOT_JAVA_HOME': 'third_party/java/linux/j2sdk',
       'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
     cwd=api.path["checkout"])
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     env={'BUILDBOT_JAVA_HOME': api.path['checkout'].join('third_party', 'java',
       'linux', 'j2sdk')}, cwd=api.path["checkout"])
 
 
 def dartino_win_debug_x86_dev_steps(api):
   build_properties = api.properties.legacy()
   # 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)
   soln = src_cfg.solutions.add()
   soln.name = "sdk"
   soln.url = "https://github.com/dartino/sdk.git"
   soln.custom_deps = {}
   soln.custom_vars = {}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True, no_shallow=True)
   build_properties.update(result.json.output.get("properties", {}))
   # gclient revert step; made unnecessary by bot_update
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
   env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
       'DEPOT_TOOLS_UPDATE': '0'}
-  api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
+  api.python("gclient runhooks wrapper", api.infra_paths['build'].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # taskkill step
   api.python("Taskkill", api.path["checkout"].join("third_party", "dart",
     "tools", "task_kill.py"), args=["--kill_browsers=True"],
     cwd=api.path["checkout"])
   # dartino annotated steps step
   api.step("annotated steps", ["python_slave",
     api.path["checkout"].join("tools", "bots", "dartino.py")],
     allow_subannotations=True, env={'BUILDBOT_ANNOTATED_STEPS_RUN': '1',
       "BUILDBOT_BUILDERNAME": api.properties["buildername"]},
@@ skipping 240 matching lines @@
     api.properties(mastername='client.fletch') +
     api.properties(buildername='dartino-win-debug-x86-dev') +
     api.properties(revision='123456789abcdef') +
     api.properties(slavename='TestSlave')
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='client.fletch') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )