diff options
Diffstat (limited to 'layout/tools/reftest/mach_test_package_commands.py')
-rw-r--r-- | layout/tools/reftest/mach_test_package_commands.py | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/layout/tools/reftest/mach_test_package_commands.py b/layout/tools/reftest/mach_test_package_commands.py index e3bf64cb8..197800cf2 100644 --- a/layout/tools/reftest/mach_test_package_commands.py +++ b/layout/tools/reftest/mach_test_package_commands.py @@ -29,8 +29,6 @@ def run_reftest(context, **kwargs): normalize = partial(context.normalize_test_path, test_root) args.tests = map(normalize, args.tests) - if mozinfo.info.get('buildapp') == 'mobile/android': - return run_reftest_android(context, args) return run_reftest_desktop(context, args) @@ -44,37 +42,13 @@ def run_reftest_desktop(context, args): return run_test_harness(parser, args) -def run_reftest_android(context, args): - from remotereftest import run_test_harness - - args.app = args.app or 'org.mozilla.fennec' - args.utilityPath = context.hostutils - args.xrePath = context.hostutils - args.httpdPath = context.module_dir - args.dm_trans = 'adb' - args.ignoreWindowSize = True - args.printDeviceInfo = False - - config = context.mozharness_config - if config: - args.remoteWebServer = config['remote_webserver'] - args.httpPort = config['emulator']['http_port'] - args.sslPort = config['emulator']['ssl_port'] - args.adb_path = config['exes']['adb'] % {'abs_work_dir': context.mozharness_workdir} - - return run_test_harness(parser, args) - - def setup_argument_parser(): import mozinfo import reftestcommandline global parser mozinfo.find_and_update_from_json(here) - if mozinfo.info.get('buildapp') == 'mobile/android': - parser = reftestcommandline.RemoteArgumentsParser() - else: - parser = reftestcommandline.DesktopArgumentsParser() + parser = reftestcommandline.DesktopArgumentsParser() return parser |