Index: build/android/run_tests.py |
diff --git a/build/android/run_tests.py b/build/android/run_tests.py |
index f749aaec8d92b035250e297da1ff3f83eec9c071..bed8d60c8d33e6ddd914ae4d724ac03201f9c778 100755 |
--- a/build/android/run_tests.py |
+++ b/build/android/run_tests.py |
@@ -323,7 +323,7 @@ def _RunATestSuite(options): |
buildbot_emulators = [] |
if options.use_emulator: |
- for n in range(options.use_emulator): |
+ for n in range(options.emulator_count): |
t = TimeProfile('Emulator launch %d' % n) |
buildbot_emulator = emulator.Emulator(options.fast_and_loose) |
buildbot_emulator.Launch(kill_all_emulators=n == 0) |
@@ -384,7 +384,7 @@ def _RunATestSuite(options): |
def Dispatch(options): |
"""Dispatches the tests, sharding if possible. |
- If options.use_emulator is True, all tests will be run in a new emulator |
+ If options.use_emulator is True, all tests will be run in new emulator |
instance. |
Args: |
@@ -447,9 +447,11 @@ def main(argv): |
'subfolder debug_info_dumps under the same directory' |
'in where the test_suite exists.') |
option_parser.add_option('-e', '--emulator', dest='use_emulator', |
- help='Run tests in a new instance of emulator', |
- type='int', |
- default=0) |
+ action='store_true', default=False, |
bulach
2012/07/16 09:23:15
nit: no need for default=False
Wei James(wistoch)
2012/07/16 09:42:03
fixed. thanks
|
+ help='Run tests in a new instance of emulator') |
+ option_parser.add_option('-j', '--jobs', dest='emulator_count', |
bulach
2012/07/16 09:23:15
hmm, j / jobs seem unrelated..
perhaps just keep t
Wei James(wistoch)
2012/07/16 09:42:03
fixed. thanks
|
+ type='int', default=1, |
+ help='Emulator count to run test at the same time.') |
option_parser.add_option('-x', '--xvfb', dest='use_xvfb', |
action='store_true', |
help='Use Xvfb around tests (ignored if not Linux)') |