Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: build/android/run_tests.py

Issue 11801016: [Android] Break GTest emulator launching into a separate function. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Moved LaunchEmulators to emulator.py Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/android/emulator.py ('K') | « build/android/emulator.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/run_tests.py
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index aa4e7dc482e73ae73da6febe95dc3f4f32f758c7..d5bd1af7cfb842ae7f35298d10f7ba4e8c3a98d1 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -55,7 +55,6 @@ from pylib import run_tests_helper
from pylib import test_options_parser
from pylib.base_test_sharder import BaseTestSharder
from pylib.single_test_runner import SingleTestRunner
-from pylib.utils import time_profile
from pylib.utils import xvfb
@@ -247,20 +246,9 @@ def _RunATestSuite(options):
buildbot_emulators = []
if options.use_emulator:
- for n in range(options.emulator_count):
- t = time_profile.TimeProfile('Emulator launch %d' % n)
- avd_name = None
- if n > 0:
- # Creates a temporary AVD for the extra emulators.
- avd_name = 'run_tests_avd_%d' % n
- buildbot_emulator = emulator.Emulator(avd_name, options.fast_and_loose)
- buildbot_emulator.Launch(kill_all_emulators=n == 0)
- t.Stop()
- buildbot_emulators.append(buildbot_emulator)
- attached_devices.append(buildbot_emulator.device)
- # Wait for all emulators to boot completed.
- map(lambda buildbot_emulator: buildbot_emulator.ConfirmLaunch(True),
- buildbot_emulators)
+ buildbot_emulators = emulator.LaunchEmulators(options.emulator_count,
+ fast_and_loose=options.fast_and_loose)
+ attached_devices = [e.device for e in buildbot_emulators]
elif options.test_device:
attached_devices = [options.test_device]
else:
« build/android/emulator.py ('K') | « build/android/emulator.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698