From 7dadceaedbab1af76ad025ea5c47759d45e96bd1 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Fri, 4 Oct 2019 07:07:29 +0000 Subject: [PATCH] Bug 1560193 - Always specify the Python executable to use when running `./mach browsertime` r=nalexander If `./mach browsertime` runs browsertime with a globally-installed node, due to an existing bug in [execa][1], the wrong Python will be executed. We now specify the full path of the Python binary we wish to use (via the `PYTHON` environment variable that our fork of browsertime supports) and avoid this issue altogether. [1]: https://github.com/sindresorhus/execa/issues/153 Differential Revision: https://phabricator.services.mozilla.com/D35374 UltraBlame original commit: d5f3bcfcd6bdf0245264e94e5050aa3dde799938 --- tools/browsertime/mach_commands.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/browsertime/mach_commands.py b/tools/browsertime/mach_commands.py index f2f8379b864da..f3bc59234b729 100644 --- a/tools/browsertime/mach_commands.py +++ b/tools/browsertime/mach_commands.py @@ -273,12 +273,18 @@ def append_env(self, append_path=True): node_dir = os.path.dirname(self.node_path) path = [node_dir] + path - - - path = [os.path.dirname(self.virtualenv_manager.python_path)] + path - append_env = { 'PATH': os.pathsep.join(path), + + + + + + + + + + 'PYTHON': self.virtualenv_manager.python_path, } if path_to_imagemagick: