Bug 1170287 - remove the --output and -v arguments used when calling talos. r=jmaher
authorJulien Pagès <j.parkouss@gmail.com>
Thu, 30 Jul 2015 17:31:52 +0200
changeset 255605 5eaae3107f44f19c58c206473d3f59236c6ee016
parent 255604 b0c6d424125aa2d1c319f2a325bad22689c8f09e
child 255606 877e06cd774bc235ee5f8ca656db5b48930b8503
push id29149
push usercbook@mozilla.com
push dateFri, 31 Jul 2015 10:10:16 +0000
treeherdermozilla-central@e9389ca320ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1170287
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/talos/talos.json
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -409,24 +409,24 @@ class Talos(TestingMixin, MercurialScrip
     def talos_options(self, args=None, **kw):
         """return options to talos"""
         # binary path
         binary_path = self.binary_path or self.config.get('binary_path')
         if not binary_path:
             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']
         if self.config.get('branch'):
             kw_options['branchName'] = self.config['branch']
         if self.symbols_path:
             kw_options['symbolsPath'] = self.symbols_path
         kw_options.update(kw)
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -144,18 +144,17 @@
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
             "plugins": {
                 "32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             },
             "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": {
             "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
             "plugins": {