From 4ccb0b5f636c536baf5032cccbf7ac54fe0538f2 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 25 Jan 2016 13:38:00 +0000 Subject: [PATCH] tests/eas/rfc: Only use the energy meter if the platform supports it EnergyMeter.getInstance() returns None if there is no energy meter for the platform. Therefore, env.emeter is None for platforms that don't have an energy meter and rfc.py fails with an AttributeError when it tries to do things like cls.env.emeter.reset() Check that emeter is not None before calling any of its methods. --- tests/eas/rfc.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/eas/rfc.py b/tests/eas/rfc.py index 364468893..6533bf16d 100644 --- a/tests/eas/rfc.py +++ b/tests/eas/rfc.py @@ -509,13 +509,15 @@ class TestBase(unittest.TestCase): cls.env.ftrace.start() # ENERGY: start sampling - cls.env.emeter.reset() + if cls.env.emeter: + cls.env.emeter.reset() # WORKLOAD: Run the configured workload wload.run(out_dir=cls.env.out_dir, cgroup=cls.cgroup) # ENERGY: collect measurements - cls.env.emeter.report(cls.env.out_dir) + if cls.env.emeter: + cls.env.emeter.report(cls.env.out_dir) # FTRACE: stop and collect measurements if cls.env.ftrace and cls.target_conf_flag(tc, 'ftrace'): -- GitLab