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

Unified Diff: build/android/emulator.py

Issue 11794039: [Android] Remove fast_and_loose option from the gtest runner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « no previous file | build/android/pylib/gtest/single_test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/emulator.py
diff --git a/build/android/emulator.py b/build/android/emulator.py
index 77c9a75daa11963c0de2502d33bc828363f5fef1..0cbe4c946c5c9a30a86528446acec25f7b506500 100755
--- a/build/android/emulator.py
+++ b/build/android/emulator.py
@@ -129,14 +129,11 @@ class Emulator(object):
# Time to wait for a "wait for boot complete" (property set on device).
_WAITFORBOOT_TIMEOUT = 300
- def __init__(self, new_avd_name, fast_and_loose):
+ def __init__(self, new_avd_name):
"""Init an Emulator.
Args:
nwe_avd_name: If set, will create a new temporary AVD.
- fast_and_loose: Loosen up the rules for reliable running for speed.
- Intended for quick testing or re-testing.
-
"""
try:
android_sdk_root = os.environ['ANDROID_SDK_ROOT']
@@ -149,7 +146,6 @@ class Emulator(object):
self.popen = None
self.device = None
self.default_avd = True
- self.fast_and_loose = fast_and_loose
self.abi = 'armeabi-v7a'
self.avd = 'avd_armeabi'
if 'x86' in os.environ.get('TARGET_PRODUCT', ''):
@@ -211,8 +207,7 @@ class Emulator(object):
"""
if kill_all_emulators:
_KillAllEmulators() # just to be sure
- if not self.fast_and_loose:
- self._AggressiveImageCleanup()
+ self._AggressiveImageCleanup()
(self.device, port) = self._DeviceName()
emulator_command = [
self.emulator,
@@ -226,13 +221,12 @@ class Emulator(object):
# Use a familiar name and port.
'-avd', self.avd,
'-port', str(port)]
- if not self.fast_and_loose:
- emulator_command.extend([
- # Wipe the data. We've seen cases where an emulator
- # gets 'stuck' if we don't do this (every thousand runs or
- # so).
- '-wipe-data',
- ])
+ emulator_command.extend([
+ # Wipe the data. We've seen cases where an emulator
+ # gets 'stuck' if we don't do this (every thousand runs or
+ # so).
+ '-wipe-data',
+ ])
logging.info('Emulator launch command: %s', ' '.join(emulator_command))
self.popen = subprocess.Popen(args=emulator_command,
stderr=subprocess.STDOUT)
« no previous file with comments | « no previous file | build/android/pylib/gtest/single_test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698