Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1521967 - Part 1: Use MOZ_HOST_BIN to find certutil in mach raptor-test for Android. r=rwood

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D17396

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nick Alexander 2019-03-18 16:50:57 +00:00
parent d1d4db5320
commit 7a1c539e39
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/mozbase/mozproxy/mozproxy/backends/mitm.py
View File

@ -354,7 +354,11 @@ class MitmproxyAndroid(Mitmproxy):
self.CERTUTIL_SLEEP = 10
if self.config['run_local']:
# when running locally, it is found in the Firefox desktop build (..obj../dist/bin)
self.certutil = os.path.join(self.config['obj_path'], 'dist', 'bin')
self.certutil = os.path.join(os.environ['MOZ_HOST_BIN'], 'certutil')
if not (os.path.isfile(self.certutil) and os.access(self.certutil, os.X_OK)):
LOG.critical("Abort: unable to execute certutil: {}".format(self.certutil))
raise
self.certutil = os.environ['MOZ_HOST_BIN']
os.environ['LD_LIBRARY_PATH'] = self.certutil
else:
# must download certutil inside hostutils via tooltool; use this manifest:

3
testing/raptor/mach_commands.py
View File

@ -181,7 +181,8 @@ class MachRaptor(MachCommandBase):
if conditions.is_android(build_obj) or kwargs['app'] in firefox_android_browsers:
from mozrunner.devices.android_device import verify_android_device
from mozdevice import ADBAndroid, ADBHost
if not verify_android_device(build_obj, install=True, app=kwargs['binary']):
if not verify_android_device(build_obj, install=True, app=kwargs['binary'],
xre=True): # Equivalent to 'run_local' = True.
return 1
debug_command = '--debug-command'