From d48f8883ab6876127b20a2c3deb6ed8937e35fa7 Mon Sep 17 00:00:00 2001 From: Zhifei Yang Date: Fri, 14 Jul 2017 14:23:29 +0800 Subject: [PATCH 1/2] Bug: Fails to install tool file path without ABI prefix Solution: Append the tool file path with ABI prefix to tools_to_install list. Signed-off-by: Zhifei Yang --- libs/utils/env.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/utils/env.py b/libs/utils/env.py index 5736ebab5..1e545c7a5 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -639,7 +639,7 @@ class TestEnv(ShareState): if not os.path.isfile(binary): binary = '{}/tools/{}/{}'\ .format(basepath, self.target.abi, tool) - tools_to_install.append(binary) + tools_to_install.append(binary) for tool_to_install in tools_to_install: self.target.install(tool_to_install) -- GitLab From 44a09200811392ff077793bcf9efe0cb5b5d9f05 Mon Sep 17 00:00:00 2001 From: Zhifei Yang Date: Tue, 1 Aug 2017 22:46:02 +0800 Subject: [PATCH 2/2] Change the log output sequence to avoid confusion. Only prompt measurement complete log in valid cases. Signed-off-by: Zhifei Yang --- libs/utils/energy.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/utils/energy.py b/libs/utils/energy.py index ec7917cb2..b23a7d2e1 100644 --- a/libs/utils/energy.py +++ b/libs/utils/energy.py @@ -460,8 +460,6 @@ class ACME(EnergyMeter): self._iio[ch_id].wait() self._iio[ch_id] = None - self._log.debug('Completed IIOCapture for %s...', - self._str(channel)) # iio-capture return "energy=value", add a simple format check if '=' not in out: @@ -469,6 +467,10 @@ class ACME(EnergyMeter): self._str(channel)) self._log.error('[%s]', out) continue + else: + self._log.debug('Completed IIOCapture for %s...', + self._str(channel)) + self._log.debug('Normal iio-capture case [%s]', out) # Build energy counter object nrg = {} -- GitLab