diff --git a/testing/mozharness/mozharness/mozilla/testing/talos.py b/testing/mozharness/mozharness/mozilla/testing/talos.py index 200e7ea0b046..11db1a80ec2a 100755 --- a/testing/mozharness/mozharness/mozilla/testing/talos.py +++ b/testing/mozharness/mozharness/mozilla/testing/talos.py @@ -603,6 +603,11 @@ class Talos(TestingMixin, MercurialScript, TooltoolMixin, 'lib', os.path.basename(_python_interp), 'site-packages') + + # if running gecko profiling install the requirements + if self.gecko_profile: + self._install_view_gecko_profile_req() + sys.path.append(_path) return @@ -632,6 +637,9 @@ class Talos(TestingMixin, MercurialScript, TooltoolMixin, requirements=[os.path.join(self.talos_path, 'requirements.txt')] ) + self._install_view_gecko_profile_req() + + def _install_view_gecko_profile_req(self): # if running locally and gecko profiing is on, we will be using the # view-gecko-profile tool which has its own requirements too if self.gecko_profile and self.run_local: diff --git a/testing/talos/talos/run_tests.py b/testing/talos/talos/run_tests.py index 8736e7ef1eea..24ebbe6138a6 100755 --- a/testing/talos/talos/run_tests.py +++ b/testing/talos/talos/run_tests.py @@ -350,6 +350,9 @@ def run_tests(config, browser_config): def view_gecko_profile(ffox_bin): # automatically load the latest talos gecko-profile archive in perf-html.io + if sys.platform.startswith('win') and not ffox_bin.endswith(".exe"): + ffox_bin = ffox_bin + ".exe" + if not os.path.exists(ffox_bin): LOG.info("unable to find Firefox bin, cannot launch view-gecko-profile") return