Bug 1635563 - Initial kaios support for 'mach xpcshell-test'; r=bc

Support 'mach xpcshell-test' in a KaiOS environment. This is very much like running xpcshell in an android/geckoview environment except instead of using an APK for the gre, it uses the omnijar.

Differential Revision: https://phabricator.services.mozilla.com/D75545

testing/xpcshell/mach_commands.py

@@ -188,7 +188,9 @@ class AndroidXPCShellRunner(MozbuildObject):
         if not kwargs["symbolsPath"]:
             kwargs["symbolsPath"] = os.path.join(self.distdir, 'crashreporter-symbols')
 
-        if not kwargs["localAPK"]:
+        if self.substs.get('MOZ_BUILD_APP') == 'b2g':
+            kwargs["localAPK"] = None
+        elif not kwargs["localAPK"]:
             for root, _, paths in os.walk(os.path.join(kwargs["objdir"], "gradle")):
                 for file_name in paths:
                     if (file_name.endswith(".apk") and
@@ -216,7 +218,7 @@ class AndroidXPCShellRunner(MozbuildObject):
 
 def get_parser():
     build_obj = MozbuildObject.from_environment(cwd=here)
-    if conditions.is_android(build_obj):
+    if conditions.is_android(build_obj) or build_obj.substs.get('MOZ_BUILD_APP') == 'b2g':
         return parser_remote()
     else:
         return parser_desktop()
@@ -257,7 +259,7 @@ class MachCommands(MachCommandBase):
         if not params['threadCount']:
             params['threadCount'] = int((cpu_count() * 3) / 2)
 
-        if conditions.is_android(self):
+        if conditions.is_android(self) or self.substs.get('MOZ_BUILD_APP') == 'b2g':
             from mozrunner.devices.android_device import verify_android_device, get_adb_path
             device_serial = params.get('deviceSerial')
             verify_android_device(self, network=True, device_serial=device_serial)

testing/xpcshell/remotexpcshelltests.py

@@ -145,10 +145,14 @@ class RemoteXPCShellTestThread(xpcshell.XPCShellTestThread):
         self.testingModulesDir = self.remoteModulesDir
         self.testharnessdir = self.remoteScriptsDir
         xpcsCmd = xpcshell.XPCShellTestThread.buildXpcsCmd(self)
-        # remove "-g <dir> -a <dir>" and add "--greomni <apk>"
+        # remove "-g <dir> -a <dir>" and replace with remote alternatives
         del xpcsCmd[1:5]
+        if self.options['localAPK']:
             xpcsCmd.insert(3, '--greomni')
             xpcsCmd.insert(4, self.remoteAPK)
+        else:
+            xpcsCmd.insert(1, '-g')
+            xpcsCmd.insert(2, self.remoteBinDir)
 
         if self.remoteDebugger:
             # for example, "/data/local/gdbserver" "localhost:12345"
@@ -293,15 +297,18 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             print("Couldn't find local xpcshell test directory", file=sys.stderr)
             sys.exit(1)
 
+        self.remoteAPK = None
+        if options['localAPK']:
             self.localAPKContents = ZipFile(options['localAPK'])
+            self.remoteAPK = posixpath.join(self.remoteBinDir,
+                                            os.path.basename(options['localAPK']))
+        else:
+            self.localAPKContents = None
         if options['setup']:
             self.setupTestDir()
             self.setupUtilities()
             self.setupModules()
         self.initDir(self.remoteMinidumpDir)
-        self.remoteAPK = None
-        self.remoteAPK = posixpath.join(self.remoteBinDir,
-                                        os.path.basename(options['localAPK']))
 
         # data that needs to be passed to the RemoteXPCShellTestThread
         self.mobileArgs = {
@@ -386,6 +393,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         if not abi:
             raise Exception("failed to get ro.product.cpu.abi from device")
         self.log.info("ro.product.cpu.abi %s" % abi)
+        if self.localAPKContents:
             abilist = [abi]
             retries = 0
             while not abilistprop and retries < 3:
@@ -455,12 +463,20 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.device.push(local, remoteFile)
         self.device.chmod(remoteFile, root=True)
 
+        if self.options['localAPK']:
             remoteFile = posixpath.join(self.remoteBinDir,
                                         os.path.basename(self.options['localAPK']))
             self.device.push(self.options['localAPK'], remoteFile)
             self.device.chmod(remoteFile, root=True)
 
             self.pushLibs()
+        else:
+            localB2G = os.path.join(self.options['objdir'], "dist", "b2g")
+            if os.path.exists(localB2G):
+                self.device.push(localB2G, self.remoteBinDir)
+                self.device.chmod(self.remoteBinDir, root=True)
+            else:
+                raise Exception("unable to install gre: no APK and not b2g")
 
     def pushLibs(self):
         elfhack = os.path.join(self.localBin, 'elfhack')
@@ -569,16 +585,6 @@ def main():
 
     parser = parser_remote()
     options = parser.parse_args()
-    if not options.localAPK:
-        for file in os.listdir(os.path.join(options.objdir, "dist")):
-            if (file.endswith(".apk") and file.startswith("fennec")):
-                options.localAPK = os.path.join(options.objdir, "dist")
-                options.localAPK = os.path.join(options.localAPK, file)
-                print("using APK: " + options.localAPK, file=sys.stderr)
-                break
-        else:
-            print("Error: please specify an APK", file=sys.stderr)
-            sys.exit(1)
 
     options = verifyRemoteOptions(parser, options)
     log = commandline.setup_logging("Remote XPCShell",