Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 811780 - Provide an option for creating a blank SD card image when running against an emulator. r=jgriffin

Browse Source
This commit is contained in:
Dave Hunt 2013-09-13 00:47:13 -07:00
parent 5ca5e5b0eb
commit cc8d27d8d0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testing/marionette/client/marionette/runtests.py
View File

@ -211,7 +211,8 @@ class MarionetteTestRunner(object):
revision=None, logger=None, testgroup="marionette", noWindow=False,
logcat_dir=None, xml_output=None, repeat=0, gecko_path=None,
testvars=None, tree=None, type=None, device_serial=None,
symbols_path=None, timeout=None, es_servers=None, shuffle=False, **kwargs):
symbols_path=None, timeout=None, es_servers=None, shuffle=False,
sdcard=None, **kwargs):
self.address = address
self.emulator = emulator
self.emulatorBinary = emulatorBinary
@ -246,6 +247,7 @@ class MarionetteTestRunner(object):
self._appName = None
self.es_servers = es_servers
self.shuffle = shuffle
self.sdcard = sdcard
if testvars:
if not os.path.exists(testvars):
@ -368,7 +370,8 @@ class MarionetteTestRunner(object):
logcat_dir=self.logcat_dir,
gecko_path=self.gecko_path,
symbols_path=self.symbols_path,
timeout=self.timeout)
timeout=self.timeout,
sdcard=self.sdcard)
else:
raise Exception("must specify binary, address or emulator")
@ -671,6 +674,10 @@ class MarionetteTestOptions(OptionParser):
type='str',
help='set a custom resolution for the emulator'
'Example: "480x800"')
self.add_option('--sdcard',
action='store',
dest='sdcard',
help='size of sdcard to create for the emulator')
self.add_option('--no-window',
action='store_true',
dest='noWindow',