Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.dynamorio.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',
   'gsutil',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/step',
 ]
 
 def win_xp_dr_nightly_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   soln.custom_deps = {'dynamorio/tools/buildbot':
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # dynamorio win nightly suite step
   api.step("nightly suite",
-      [api.infra_paths['build'].join("scripts", "slave", "drmemory", "build_env.bat"),
+      [api.path["build"].join("scripts", "slave", "drmemory", "build_env.bat"),
         'ctest', '--timeout', '120', '-VV', '-S',
         'dynamorio/suite/runsuite.cmake,nightly;long;'+\
             'site=X64.WindowsXp.VS2010.BuildBot'],
       env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
-        "bot_tools")}, cwd=api.infra_paths['slave_build'])
+        "bot_tools")}, cwd=api.path["slave_build"])
 
 
 def linux_dr_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # pre-commit suite step
   api.step("pre-commit suite", ['ctest', '--timeout', '120', '-VV', '-S',
     api.path["checkout"].join("suite", "runsuite.cmake")],
-    cwd=api.infra_paths['slave_build'], ok_ret="all")
+    cwd=api.path["slave_build"], ok_ret="all")
   # upload dynamorio docs step
-  api.gsutil.upload(api.infra_paths['slave_build'].join("install", "docs", "html"),
+  api.gsutil.upload(api.path["slave_build"].join("install", "docs", "html"),
       "chromium-dynamorio", "dr_docs/", ["-r"], multithreaded=True)
 
 
 def win_7_dr_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   soln.custom_deps = {'dynamorio/tools/buildbot':
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # build_env step
-  api.step("pre-commit suite", [api.infra_paths['build'].join("scripts", "slave",
+  api.step("pre-commit suite", [api.path["build"].join("scripts", "slave",
     "drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
     api.path["checkout"].join("suite", "runsuite.cmake")],
     env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
-      "bot_tools")}, cwd=api.infra_paths['slave_build'])
+      "bot_tools")}, cwd=api.path["slave_build"])
 
 
 def linux_dr_package_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   api.gclient.c = src_cfg
@@ skipping 22 matching lines @@
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # build_env step
   api.step("pre-commit suite",
-      [api.infra_paths['build'].join("scripts", "slave", "drmemory", "build_env.bat"),
+      [api.path["build"].join("scripts", "slave", "drmemory", "build_env.bat"),
         'ctest', '--timeout', '120', '-VV', '-S',
         api.path["checkout"].join("suite", "runsuite.cmake")],
       env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
-        "bot_tools")}, cwd=api.infra_paths['slave_build'])
+        "bot_tools")}, cwd=api.path["slave_build"])
 
 
 def win_xp_dr_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   soln.custom_deps = {'dynamorio/tools/buildbot':
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # build_env step
-  api.step("pre-commit suite", [api.infra_paths['build'].join("scripts", "slave",
+  api.step("pre-commit suite", [api.path["build"].join("scripts", "slave",
     "drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
     api.path["checkout"].join("suite", "runsuite.cmake")],
     env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
-      "bot_tools")}, cwd=api.infra_paths['slave_build'])
+      "bot_tools")}, cwd=api.path["slave_build"])
 
 
 def win_7_dr_nightly_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   soln.custom_deps = {'dynamorio/tools/buildbot':
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # dynamorio win nightly suite step
-  api.step("nightly suite", [api.infra_paths['build'].join("scripts", "slave",
+  api.step("nightly suite", [api.path["build"].join("scripts", "slave",
     "drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
     'dynamorio/suite/runsuite.cmake,nightly;long;'+\
         'site=X64.Windows7.VS2010.BuildBot'],
     env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
-      "bot_tools")}, cwd=api.infra_paths['slave_build'])
+      "bot_tools")}, cwd=api.path["slave_build"])
 
 
 def win_8_dr_nightly_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   soln.custom_deps = {'dynamorio/tools/buildbot':
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # dynamorio win nightly suite step
-  api.step("nightly suite", [api.infra_paths['build'].join("scripts", "slave",
+  api.step("nightly suite", [api.path["build"].join("scripts", "slave",
     "drmemory", "build_env.bat"), 'ctest', '--timeout', '120', '-VV', '-S',
     'dynamorio/suite/runsuite.cmake,nightly;long;'+\
         'site=X64.Windows8.VS2010.BuildBot'],
     env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
-      "bot_tools")}, cwd=api.infra_paths['slave_build'])
+      "bot_tools")}, cwd=api.path["slave_build"])
 
 
 def win_dr_package_steps(api):
   build_properties = api.properties.legacy()
   # checkout DynamiRIO step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "dynamorio"
   soln.url = "https://github.com/DynamoRIO/dynamorio.git"
   soln.custom_deps = {'dynamorio/tools/buildbot':
       'https://github.com/DynamoRIO/buildbot.git'}
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties.update(result.json.output.get("properties", {}))
   # unpack tools step; generic ShellCommand converted
   api.step("unpack tools", [api.path["checkout"].join('tools', 'buildbot',
     'bot_tools', 'unpack.bat')], env={},
       cwd=api.path["checkout"].join('tools', 'buildbot', 'bot_tools'))
   # get buildnumber step; no longer needed
   # Package DynamoRIO step
-  api.step("Package DynamoRIO", [api.infra_paths['build'].join("scripts", "slave",
+  api.step("Package DynamoRIO", [api.path["build"].join("scripts", "slave",
     "drmemory", "build_env.bat"), "ctest", "-VV", "-S",
     str(api.path["checkout"].join("make", "package.cmake")) + ",build=0x" +
     build_properties["got_revision"][:7]],
     env={"BOTTOOLS": api.path["checkout"].join("tools", "buildbot",
       "bot_tools")})
   # find package file step; no longer necessary
   # upload dynamorio package
   api.gsutil.upload("DynamoRIO-Windows-*" +
       build_properties["got_revision"][:7]
       + ".zip", "chromium-dynamorio", "builds/")
@@ skipping 97 matching lines @@
     api.properties(mastername='client.dynamorio') +
     api.properties(buildername='linux-dr-nightly') +
     api.properties(revision='123456789abcdef') +
     api.properties(slavename='TestSlave')
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='client.dynamorio') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )