From 0c69b863e0e6bccd2888f9298aa215883247d106 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Fri, 20 Oct 2017 17:32:01 +0100 Subject: [PATCH 1/2] TestEnv: Report calibration if ftrace configured --- 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 90766fd35..2ab5aa441 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -828,7 +828,7 @@ class TestEnv(ShareState): if not force and self._calib: return self._calib - required = force or 'rt-app' in self.__installed_tools + required = force or 'rt-app' in self.__installed_tools or 'ftrace' in self.test_conf if not required: self._log.debug('No RT-App workloads, skipping calibration') -- GitLab From 8789abf0fc4612e0b93cc9ba700c5149ad5545cb Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Fri, 20 Oct 2017 17:32:55 +0100 Subject: [PATCH 2/2] TestEnv: Report calibration if it's provided in target conf --- libs/utils/env.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/utils/env.py b/libs/utils/env.py index 2ab5aa441..7f9d21a76 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -828,12 +828,6 @@ class TestEnv(ShareState): if not force and self._calib: return self._calib - required = force or 'rt-app' in self.__installed_tools or 'ftrace' in self.test_conf - - if not required: - self._log.debug('No RT-App workloads, skipping calibration') - return - if not force and 'rtapp-calib' in self.conf: self._log.warning('Using configuration provided RTApp calibration') self._calib = { @@ -841,6 +835,14 @@ class TestEnv(ShareState): for key, value in self.conf['rtapp-calib'].items() } else: + required = (force or + 'rt-app' in self.__installed_tools or + 'ftrace' in self.test_conf) + + if not required: + self._log.debug('No RT-App workloads, skipping calibration') + return + self._log.info('Calibrating RTApp...') self._calib = RTA.calibrate(self.target) -- GitLab