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

Bug 1454404 - Pass adb path from Android mach commands to test harnesses; r=jmaher

Browse source
This commit is contained in:
Geoff Brown 2018-04-16 14:05:32 -06:00
parent ce07cbb7d8
commit ca43a015dc
9 changed files with 11 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
layout/tools/reftest/reftestcommandline.py
View file

@ -410,7 +410,7 @@ class RemoteArgumentsParser(ReftestArgumentsParser):
action="store", action="store",
type=str, type=str,
dest="adb_path", dest="adb_path",
default="adb", default=None,
help="path to adb") help="path to adb")
self.add_argument("--deviceSerial", self.add_argument("--deviceSerial",

2
layout/tools/reftest/remotereftest.py
View file

@ -149,7 +149,7 @@ class RemoteReftest(RefTest):
if options.log_tbpl_level == 'debug' or options.log_mach_level == 'debug': if options.log_tbpl_level == 'debug' or options.log_mach_level == 'debug':
verbose = True verbose = True
print "set verbose!" print "set verbose!"
self.device = ADBAndroid(adb=options.adb_path, self.device = ADBAndroid(adb=options.adb_path or 'adb',
device=options.deviceSerial, device=options.deviceSerial,
test_root=options.remoteTestRoot, test_root=options.remoteTestRoot,
verbose=verbose) verbose=verbose)

2
testing/mochitest/mochitest_options.py
View file

@ -855,7 +855,7 @@ class AndroidArguments(ArgumentContainer):
}], }],
[["--adbpath"], [["--adbpath"],
{"dest": "adbPath", {"dest": "adbPath",
"default": "adb", "default": None,
"help": "Path to adb binary.", "help": "Path to adb binary.",
"suppress": True, "suppress": True,
}], }],

4
testing/mochitest/rungeckoview.py
View file

@ -39,7 +39,7 @@ class GeckoviewOptions(OptionParser):
help="serial ID of remote device to test") help="serial ID of remote device to test")
self.add_option("--adbpath", self.add_option("--adbpath",
action="store", type="string", dest="adbPath", action="store", type="string", dest="adbPath",
default="adb", default=None,
help="Path to adb binary.") help="Path to adb binary.")
self.add_option("--remoteTestRoot", self.add_option("--remoteTestRoot",
action="store", type="string", dest="remoteTestRoot", action="store", type="string", dest="remoteTestRoot",
@ -56,7 +56,7 @@ class GeckoviewTestRunner:
def __init__(self, log, options): def __init__(self, log, options):
self.log = log self.log = log
self.device = ADBAndroid(adb=options.adbPath, self.device = ADBAndroid(adb=options.adbPath or 'adb',
device=options.deviceSerial, device=options.deviceSerial,
test_root=options.remoteTestRoot) test_root=options.remoteTestRoot)
self.options = options self.options = options

2
testing/mochitest/runrobocop.py
View file

@ -47,7 +47,7 @@ class RobocopTestRunner(MochitestDesktop):
verbose = False verbose = False
if options.log_tbpl_level == 'debug' or options.log_mach_level == 'debug': if options.log_tbpl_level == 'debug' or options.log_mach_level == 'debug':
verbose = True verbose = True
self.device = ADBAndroid(adb=options.adbPath, self.device = ADBAndroid(adb=options.adbPath or 'adb',
device=options.deviceSerial, device=options.deviceSerial,
test_root=options.remoteTestRoot, test_root=options.remoteTestRoot,
verbose=verbose) verbose=verbose)

2
testing/mochitest/runtestsremote.py
View file

@ -40,7 +40,7 @@ class MochiRemote(MochitestDesktop):
self.chromePushed = False self.chromePushed = False
self.mozLogName = "moz.log" self.mozLogName = "moz.log"
self.device = ADBAndroid(adb=options.adbPath, self.device = ADBAndroid(adb=options.adbPath or 'adb',
device=options.deviceSerial, device=options.deviceSerial,
test_root=options.remoteTestRoot, test_root=options.remoteTestRoot,
verbose=verbose) verbose=verbose)

4
testing/remotecppunittests.py
View file

@ -28,7 +28,7 @@ class RemoteCPPUnitTests(cppunittests.CPPUnitTests):
def __init__(self, options, progs): def __init__(self, options, progs):
cppunittests.CPPUnitTests.__init__(self) cppunittests.CPPUnitTests.__init__(self)
self.options = options self.options = options
self.device = ADBAndroid(adb=options.adb_path, self.device = ADBAndroid(adb=options.adb_path or 'adb',
device=options.device_serial, device=options.device_serial,
test_root=options.remote_test_root) test_root=options.remote_test_root)
self.remote_test_root = posixpath.join(self.device.test_root, "cppunittests") self.remote_test_root = posixpath.join(self.device.test_root, "cppunittests")
@ -175,7 +175,7 @@ class RemoteCPPUnittestOptions(cppunittests.CPPUnittestOptions):
self.add_option("--adbPath", action="store", self.add_option("--adbPath", action="store",
type="string", dest="adb_path", type="string", dest="adb_path",
help="Path to adb") help="Path to adb")
defaults["adb_path"] = "adb" defaults["adb_path"] = None
self.add_option("--noSetup", action="store_false", self.add_option("--noSetup", action="store_false",
dest="setup", dest="setup",

2
testing/xpcshell/remotexpcshelltests.py
View file

@ -241,7 +241,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
verbose = False verbose = False
if options['log_tbpl_level'] == 'debug' or options['log_mach_level'] == 'debug': if options['log_tbpl_level'] == 'debug' or options['log_mach_level'] == 'debug':
verbose = True verbose = True
self.device = ADBAndroid(adb=options['adbPath'], self.device = ADBAndroid(adb=options['adbPath'] or 'adb',
device=options['deviceSerial'], device=options['deviceSerial'],
test_root=options['remoteTestRoot'], test_root=options['remoteTestRoot'],
verbose=verbose) verbose=verbose)

2
testing/xpcshell/xpcshellcommandline.py
View file

@ -147,7 +147,7 @@ def add_remote_arguments(parser):
help="serial ID of device") help="serial ID of device")
parser.add_argument("--adbPath", action="store", type=str, dest="adbPath", parser.add_argument("--adbPath", action="store", type=str, dest="adbPath",
default="adb", default=None,
help="Path to adb") help="Path to adb")
parser.add_argument("--noSetup", action="store_false", dest="setup", default=True, parser.add_argument("--noSetup", action="store_false", dest="setup", default=True,