From c7af676d000700bb3946db3ae0bb36a8b880ddea Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Mon, 23 Oct 2017 16:49:27 +0100 Subject: [PATCH 1/2] instrumentation/dmesg: Fix use of devlib APIs I missed these call sites when porting this from WA2. --- wa/instrumentation/dmesg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wa/instrumentation/dmesg.py b/wa/instrumentation/dmesg.py index 05cdeba0..f3ea0fcb 100644 --- a/wa/instrumentation/dmesg.py +++ b/wa/instrumentation/dmesg.py @@ -44,8 +44,8 @@ class DmesgInstrument(Instrument): def setup(self, context): if self.loglevel: - self.old_loglevel = self.target.get_sysfile_value(self.loglevel_file) - self.target.set_sysfile_value(self.loglevel_file, self.loglevel, verify=False) + self.old_loglevel = self.target.read_int(self.loglevel_file) + self.target.write_value(self.loglevel_file, self.loglevel, verify=False) self.before_file = _f(os.path.join(context.output_directory, 'dmesg', 'before')) self.after_file = _f(os.path.join(context.output_directory, 'dmesg', 'after')) @@ -64,4 +64,4 @@ class DmesgInstrument(Instrument): def teardown(self, context): # pylint: disable=unused-argument if self.loglevel: - self.target.set_sysfile_value(self.loglevel_file, self.old_loglevel, verify=False) + self.target.write_value(self.loglevel_file, self.old_loglevel, verify=False) From 462c3eaa78fda630f3d46080992cc6a6e3aaa461 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Mon, 23 Oct 2017 17:10:39 +0100 Subject: [PATCH 2/2] instrumentation/dmesg: Fix missing @slow decorator --- wa/instrumentation/dmesg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/wa/instrumentation/dmesg.py b/wa/instrumentation/dmesg.py index f3ea0fcb..87dbba04 100644 --- a/wa/instrumentation/dmesg.py +++ b/wa/instrumentation/dmesg.py @@ -57,6 +57,7 @@ class DmesgInstrument(Instrument): if self.target.is_rooted: self.target.execute('dmesg -c', as_root=True) + @slow def stop(self, context): with open(self.after_file, 'w') as wfh: wfh.write(self.target.execute('dmesg', as_root=self.need_root))