Bug 1466828 - Fix auto-launching of talos gecko profiles in perfhtml.io; r?jmaher draft
authorRob Wood <rwood@mozilla.com>
Tue, 05 Jun 2018 15:31:51 -0400
changeset 804336 3ce48eebfa6dfa92184de6488955dc044406c37f
parent 804295 c8103e36d8cff7ae4d18244f1ea5bef53c78c1b1
push id112350
push userrwood@mozilla.com
push dateTue, 05 Jun 2018 20:16:58 +0000
reviewersjmaher
bugs1466828
milestone62.0a1
Bug 1466828 - Fix auto-launching of talos gecko profiles in perfhtml.io; r?jmaher MozReview-Commit-ID: AiEdkKiN8zq
testing/mozharness/mozharness/mozilla/testing/talos.py
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -181,17 +181,18 @@ class Talos(TestingMixin, MercurialScrip
         self.run_local = self.config.get('run_local')
         self.installer_url = self.config.get("installer_url")
         self.talos_json_url = self.config.get("talos_json_url")
         self.talos_json = self.config.get("talos_json")
         self.talos_json_config = self.config.get("talos_json_config")
         self.repo_path = self.config.get("repo_path")
         self.obj_path = self.config.get("obj_path")
         self.tests = None
-        self.gecko_profile = self.config.get('gecko_profile')
+        self.gecko_profile = self.config.get('gecko_profile') or \
+            "--geckoProfile" in self.config.get("talos_extra_options", [])
         self.gecko_profile_interval = self.config.get('gecko_profile_interval')
         self.pagesets_name = None
         self.benchmark_zip = None
         self.mitmproxy_rel_bin = None # some platforms download a mitmproxy release binary
         self.mitmproxy_recording_set = None # zip file found on tooltool that contains all of the mitmproxy recordings
         self.mitmproxy_recordings_file_list = self.config.get('mitmproxy', None) # files inside the recording set
         self.mitmdump = None # path to mitdump tool itself, in py3 venv