From a5640502ac7be9f095b220ce26986276959cc19a Mon Sep 17 00:00:00 2001
From: Javi Merino <javi.merino@arm.com>
Date: Fri, 17 Jan 2020 17:00:59 +0000
Subject: [PATCH] devlib/AndroidTarget: Allow passing format options to
dump_logcat()
logcat has a modifier for its output format. Add a logcat_format
parameter to dump_logcat() so that we can pass it on to logcat.
---
devlib/target.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/devlib/target.py b/devlib/target.py
index 46a89d4..92c2633 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -1507,15 +1507,18 @@ class AndroidTarget(Target):
self._ensure_executables_directory_is_writable()
self.remove(on_device_executable, as_root=self.needs_su)
- def dump_logcat(self, filepath, filter=None, append=False, timeout=30): # pylint: disable=redefined-builtin
+ def dump_logcat(self, filepath, filter=None, logcat_format=None, append=False,
+ timeout=30): # pylint: disable=redefined-builtin
op = '>>' if append else '>'
filtstr = ' -s {}'.format(quote(filter)) if filter else ''
+ formatstr = ' -v {}'.format(quote(logcat_format)) if logcat_format else ''
+ logcat_opts = '-d' + formatstr + filtstr
if isinstance(self.conn, AdbConnection):
- command = 'logcat -d{} {} {}'.format(filtstr, op, quote(filepath))
+ command = 'logcat {} {} {}'.format(logcat_opts, op, quote(filepath))
adb_command(self.adb_name, command, timeout=timeout)
else:
dev_path = self.get_workpath('logcat')
- command = 'logcat -d{} {} {}'.format(filtstr, op, quote(dev_path))
+ command = 'logcat {} {} {}'.format(logcat_opts, op, quote(dev_path))
self.execute(command, timeout=timeout)
self.pull(dev_path, filepath)
self.remove(dev_path)