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

Unified Diff: build/android/pylib/local/device/local_device_instrumentation_test_run.py

Issue 2753993002: (Reland) Use logdog butler subcommand to run tests. (Closed)
Patch Set: change back to 0.08 Created 3 years, 9 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 | « build/android/pylib/android/logdog_logcat_monitor.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py
diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
index 1cc82f961405df3dcc7533a7ff1551c743fca76d..91234270d0db7bd347948808aeba36f41833d7f7 100644
--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
@@ -35,6 +35,9 @@ TIMEOUT_ANNOTATIONS = [
('SmallTest', 1 * 60),
]
+LOGCAT_FILTERS = ['*:e', 'chromium:v', 'cr_chromium:v',
jbudorick 2017/03/20 22:31:19 I think we can just take 'cr_*:v' rather than the
BigBossZhiling 2017/03/20 22:37:13 Done.
+ 'cr_ChromiumAndroidLinker:v', 'cr_LibraryLoader:v',
+ 'cr_LinkerTest:v']
# TODO(jbudorick): Make this private once the instrumentation test_runner is
# deprecated.
@@ -291,7 +294,8 @@ class LocalDeviceInstrumentationTestRun(
time.strftime('%Y%m%dT%H%M%S', time.localtime()),
device.serial)
logmon = logdog_logcat_monitor.LogdogLogcatMonitor(
- device.adb, stream_name)
+ device.adb, stream_name, filter_specs=LOGCAT_FILTERS)
+
with contextlib_ext.Optional(
logmon, self._test_instance.should_save_logcat):
with contextlib_ext.Optional(
« no previous file with comments | « build/android/pylib/android/logdog_logcat_monitor.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698