sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

LogcatCollector: Learn to pass format to logcat

Browse Source 
logcat -v lets you specify the format for the logcat output.  Add a
parameter to the LogcatCollector to allow us to pass that information
down to the logcat invocation.
This commit is contained in:
Javi Merino 2020-04-16 16:18:56 +01:00 committed by Marc Bonnici
parent 07cad78046
commit 569e4bd057
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devlib/collector/logcat.py
View File

@ -22,9 +22,10 @@ from devlib.utils.android import LogcatMonitor
class LogcatCollector(CollectorBase): class LogcatCollector(CollectorBase):
def __init__(self, target, regexps=None): def __init__(self, target, regexps=None, logcat_format=None):
super(LogcatCollector, self).__init__(target) super(LogcatCollector, self).__init__(target)
self.regexps = regexps self.regexps = regexps
self.logcat_format = logcat_format
self.output_path = None self.output_path = None
self._collecting = False self._collecting = False
self._prev_log = None self._prev_log = None
@ -49,7 +50,7 @@ class LogcatCollector(CollectorBase):
""" """
if self.output_path is None: if self.output_path is None:
raise RuntimeError("Output path was not set.") raise RuntimeError("Output path was not set.")
self._monitor = LogcatMonitor(self.target, self.regexps) self._monitor = LogcatMonitor(self.target, self.regexps, logcat_format=self.logcat_format)
if self._prev_log: if self._prev_log:
# Append new data collection to previous collection # Append new data collection to previous collection
self._monitor.start(self._prev_log) self._monitor.start(self._prev_log)

6
devlib/utils/android.py
View File

@ -714,11 +714,12 @@ class LogcatMonitor(object):
def logfile(self): def logfile(self):
return self._logfile return self._logfile
def __init__(self, target, regexps=None): def __init__(self, target, regexps=None, logcat_format=None):
super(LogcatMonitor, self).__init__() super(LogcatMonitor, self).__init__()
self.target = target self.target = target
self._regexps = regexps self._regexps = regexps
self._logcat_format = logcat_format
self._logcat = None self._logcat = None
self._logfile = None self._logfile = None
@ -750,6 +751,9 @@ class LogcatMonitor(object):
else: else:
logcat_cmd = '{} | grep {}'.format(logcat_cmd, quote(regexp)) logcat_cmd = '{} | grep {}'.format(logcat_cmd, quote(regexp))
if self._logcat_format:
logcat_cmd = "{} -v {}".format(logcat_cmd, quote(self._logcat_format))
logcat_cmd = get_adb_command(self.target.conn.device, logcat_cmd) logcat_cmd = get_adb_command(self.target.conn.device, logcat_cmd)
logger.debug('logcat command ="{}"'.format(logcat_cmd)) logger.debug('logcat command ="{}"'.format(logcat_cmd))