Browse files

Bug 752020 - upgrade mozharness.mozilla.testing.talos to work with mo…

…dern mozharness;r=aki
  • Loading branch information...
1 parent 5fd49fc commit db564e1971b75cede0cd11a5558b5e71f1c07ca3 @k0s k0s committed May 4, 2012
Showing with 6 additions and 11 deletions.
  1. +6 −11 mozharness/mozilla/testing/talos.py
View
17 mozharness/mozilla/testing/talos.py
@@ -105,11 +105,15 @@ def _pre_config_lock(self, rw_config):
def PerfConfigurator_options(self, args=None, **kw):
"""return options to PerfConfigurator"""
- # TODO: do something about short options
+ # binary path
+ binary_path = self.binary_path or self.config.get('binary_path')
+ if not binary_path:
+ self.error("Talos requires a path to the binary")
+ # talos options
options = ['-v', '--develop'] # hardcoded options (for now)
kw_options = {'output': 'talos.yml', # options overwritten from **kw
- 'executablePath': self.binary,
+ 'executablePath': binary_path,
'activeTests': self.tests,
'results_url': self.results_url}
if self.config.get('title'):
@@ -140,22 +144,13 @@ def talos_conf_path(self, conf):
def preflight_generate_config(self):
- # path to browser
- if self.binary_path:
- self.binary_path = os.path.abspath(self.binary_path)
- if not os.path.exists(self.binary_path):
- self.fatal("Path to binary does not exist: %s" % self.binary_path)
- else:
- self.fatal("No path to binary specified; please specify --binary")
-
# Talos tests to run
self.tests = self.config['tests']
if not self.tests:
self.fatal("No tests specified; please specify --tests")
def generate_config(self, conf='talos.yml', options=None):
"""generate talos configuration"""
-
# XXX note: conf *must* match what is in options, if the latter is given
# find the path to the talos .yml configuration

0 comments on commit db564e1

Please sign in to comment.