Bug 1216507 - Use the correct busybox binary for x86 emulator. r=ahal
authorEdgar Chen <echen@mozilla.com>
Sat, 10 Oct 2015 12:00:18 +0800
changeset 304215 671029ae9f3f2a03cb7c3e47499c61ab060b592b
parent 304214 b6b670151164e53f196ecdb8a9bba73a804df57b
child 304216 7981fa1da2ea3ce84ae35b9c1b8a53276a447ada
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1216507
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1216507 - Use the correct busybox binary for x86 emulator. r=ahal
testing/xpcshell/mach_commands.py
--- a/testing/xpcshell/mach_commands.py
+++ b/testing/xpcshell/mach_commands.py
@@ -271,16 +271,19 @@ class B2GXPCShellRunner(MozbuildObject):
             print(ADB_NOT_FOUND % ('mochitest-remote', kwargs["b2g_home"]))
             sys.exit(1)
 
         import runtestsb2g
 
         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:
             kwargs["b2g_path"] = kwargs["b2g_home"]
         if kwargs["busybox"] is None:
             kwargs["busybox"] = os.environ.get('BUSYBOX')
         if kwargs["busybox"] is None:
             kwargs["busybox"] = self._download_busybox(kwargs["b2g_home"], kwargs["emulator"])
@@ -299,19 +302,16 @@ class B2GXPCShellRunner(MozbuildObject):
             kwargs["objdir"] = self.topobjdir
         if kwargs["symbolsPath"] is None:
             kwargs["symbolsPath"] = os.path.join(self.distdir, 'crashreporter-symbols')
         if kwargs["testingModulesDir"] is None:
             kwargs["testingModulesDir"] = os.path.join(self.tests_dir, 'modules')
         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)
 
         self.log_manager.disable_unstructured()
         return rv
 
 def get_parser():