Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1216507 - Use the correct busybox binary for x86 emulator. r=ahal

Browse Source 
--HG--
extra : commitid : Ey1NBOsP7ux
extra : rebase_source : 6c0aecfedfc19b1af960a0333a2cd192edfd3273
extra : amend_source : 3e0973c5bc3cbf975c16e180ad06f5405a7ab1ef
This commit is contained in:
Edgar Chen 2015-10-10 12:00:18 +08:00
parent 7fb49ed66f
commit b7041c4fe1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/xpcshell/mach_commands.py
View File

@ -276,6 +276,9 @@ class B2GXPCShellRunner(MozbuildObject):
log = kwargs.pop("log")
self.log_manager.enable_unstructured()
if kwargs["device_name"].startswith('emulator') and 'x86' in kwargs["device_name"]:
kwargs["emulator"] = 'x86'
if kwargs["xpcshell"] is None:
kwargs["xpcshell"] = "xpcshell"
if kwargs["b2g_path"] is None:
@ -304,9 +307,6 @@ class B2GXPCShellRunner(MozbuildObject):
if kwargs["use_device_libs"] is None:
kwargs["use_device_libs"] = True
if kwargs["device_name"].startswith('emulator') and 'x86' in kwargs["device_name"]:
kwargs["emulator"] = 'x86'
parser = parser_b2g()
options = argparse.Namespace(**kwargs)
rv = runtestsb2g.run_remote_xpcshell(parser, options, log)