diff --git a/testing/mozharness/mozharness/mozilla/testing/talos.py b/testing/mozharness/mozharness/mozilla/testing/talos.py index 45dcf6191006..8f0748afd2c3 100755 --- a/testing/mozharness/mozharness/mozilla/testing/talos.py +++ b/testing/mozharness/mozharness/mozilla/testing/talos.py @@ -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'] diff --git a/testing/talos/talos.json b/testing/talos/talos.json index 55c5e1d75787..f9d09809a32b 100644 --- a/testing/talos/talos.json +++ b/testing/talos/talos.json @@ -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": {