Bug 1355731 - Use new tooltool wrapper in AWSY jobs. r?chmanchester
--- a/testing/awsy/mach_commands.py
+++ b/testing/awsy/mach_commands.py
@@ -100,21 +100,20 @@ class MachCommands(MachCommandBase):
if not kwargs['webRootDir']:
# Populate the Awsy webroot if not specified by the user.
manifest_file = os.path.join(self.topsrcdir,
'testing',
'awsy',
'tp5n-pageset.manifest')
tooltool_args = {"args": [
- os.path.join(self.topsrcdir, "python/mozbuild/mozbuild/action/tooltool.py"),
- "--manifest=%s" % manifest_file,
- "--unpack",
- "--cache-folder=%s" % os.path.join(self.topsrcdir, "tooltool-cache"),
- "fetch"
+ os.path.join(self.topsrcdir, "mach"),
+ "artifact", "toolchain", "-v",
+ "--tooltool-manifest=%s" % manifest_file,
+ "--cache-dir=%s" % os.path.join(self.topsrcdir, "tooltool-cache"),
]}
self.run_process(cwd=page_load_test_dir, **tooltool_args)
tp5nzip = os.path.join(page_load_test_dir, 'tp5n.zip')
tp5nmanifest = os.path.join(page_load_test_dir, 'tp5n', 'tp5n.manifest')
if not os.path.exists(tp5nmanifest):
files = mozfile.extract_zip(tp5nzip, page_load_test_dir)