From 3e9076b7c365e04469c55d812996d03232b1f110 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Mon, 30 Oct 2017 14:01:42 +0000 Subject: [PATCH 1/2] Revert "TestEnv: Report calibration if it's provided in target conf" This reverts commit 18e759a47196514e21510aa48fb6b3a8a5780b2e. This commit makes sense on its own I think, but its parent is garbage so I'm reverting this too. Will submit a separate commit to re-do what this commit does. --- libs/utils/env.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libs/utils/env.py b/libs/utils/env.py index 7f9d21a76..2ab5aa441 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -828,6 +828,12 @@ 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 = { @@ -835,14 +841,6 @@ 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 From d6c3c6d8552c9f513477e758222fd28648b7172c Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Mon, 30 Oct 2017 14:02:32 +0000 Subject: [PATCH 2/2] Revert "TestEnv: Report calibration if ftrace configured" This reverts commit bb12f8b5e7270d0a63c46288c05e67ecdeeb9b27. This commit was nonsense. --- 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 2ab5aa441..90766fd35 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 or 'ftrace' in self.test_conf + required = force or 'rt-app' in self.__installed_tools if not required: self._log.debug('No RT-App workloads, skipping calibration') -- GitLab