Bug 1170287 - remove the --output and -v arguments used when calling talos. r=jmaher

This also remove the useless xperf argument given for xperf tests

--HG--
extra : commitid : 8wJeWrMhtiA
extra : rebase_source : cf66053eeaefb8eed855b792fdcd7b35c12bc096
This commit is contained in:
Julien Pagès 2015-07-30 17:31:52 +02:00
parent 17e42272cd
commit 12f7c9c54d
2 changed files with 4 additions and 5 deletions

View File

@ -414,14 +414,14 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
self.fatal("Talos requires a path to the binary. You can specify binary_path or add download-and-extract to your action list.")
# talos options
options = ['-v', ] # hardcoded options (for now)
options = []
if self.config.get('python_webserver', True):
options.append('--develop')
# talos can't gather data if the process name ends with '.exe'
if binary_path.endswith('.exe'):
binary_path = binary_path[:-4]
kw_options = {'output': 'talos.yml', # options overwritten from **kw
'executablePath': binary_path}
# options overwritten from **kw
kw_options = {'executablePath': binary_path}
kw_options['activeTests'] = self.query_tests()
if self.config.get('title'):
kw_options['title'] = self.config['title']

View File

@ -149,8 +149,7 @@
},
"talos_options": [
"--xperf_path",
"\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\"",
"C:/slave/talos-data/talos/xperf.config"
"\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
]
},
"xperf-e10s": {