nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1882798 - Cleanup some B2G code under testing/xpcshell, r=gbrown

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D203126
This commit is contained in:
Andrew Halberstadt 2024-02-29 15:53:30 +00:00
parent 8e3ebecd63
commit ed1a3b2897
2 changed files with 4 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
testing/xpcshell/mach_commands.py
View file

@ -164,9 +164,7 @@ class AndroidXPCShellRunner(MozbuildObject):
if not kwargs["symbolsPath"]: if not kwargs["symbolsPath"]:
kwargs["symbolsPath"] = os.path.join(self.distdir, "crashreporter-symbols") kwargs["symbolsPath"] = os.path.join(self.distdir, "crashreporter-symbols")
if self.substs.get("MOZ_BUILD_APP") == "b2g": if not kwargs["localAPK"]:
kwargs["localAPK"] = None
elif not kwargs["localAPK"]:
for root, _, paths in os.walk(os.path.join(kwargs["objdir"], "gradle")): for root, _, paths in os.walk(os.path.join(kwargs["objdir"], "gradle")):
for file_name in paths: for file_name in paths:
if file_name.endswith(".apk") and file_name.startswith( if file_name.endswith(".apk") and file_name.startswith(
@ -195,10 +193,7 @@ class AndroidXPCShellRunner(MozbuildObject):
def get_parser(): def get_parser():
build_obj = MozbuildObject.from_environment(cwd=here) build_obj = MozbuildObject.from_environment(cwd=here)
if ( if conditions.is_android(build_obj):
conditions.is_android(build_obj)
or build_obj.substs.get("MOZ_BUILD_APP") == "b2g"
):
return parser_remote() return parser_remote()
else: else:
return parser_desktop() return parser_desktop()
@ -245,10 +240,7 @@ def run_xpcshell_test(command_context, test_objects=None, **params):
# pylint --py3k W1619 # pylint --py3k W1619
params["threadCount"] = int((cpu_count() * 3) / 2) params["threadCount"] = int((cpu_count() * 3) / 2)
if ( if conditions.is_android(command_context):
conditions.is_android(command_context)
or command_context.substs.get("MOZ_BUILD_APP") == "b2g"
):
from mozrunner.devices.android_device import ( from mozrunner.devices.android_device import (
InstallIntent, InstallIntent,
get_adb_path, get_adb_path,

7
testing/xpcshell/remotexpcshelltests.py
View file

@ -652,12 +652,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
self.pushLibs() self.pushLibs()
else: else:
localB2G = os.path.join(self.options["objdir"], "dist", "b2g") raise Exception("unable to install gre: no APK")
if os.path.exists(localB2G):
self.device.push(localB2G, self.remoteBinDir)
self.device.chmod(self.remoteBinDir)
else:
raise Exception("unable to install gre: no APK and not b2g")
def pushLibs(self): def pushLibs(self):
pushed_libs_count = 0 pushed_libs_count = 0