commit 52a6c157388f2a190b6c2bc5e2e0262e7ad7bdf0
author Brendan Jackman <brendan.jackman@arm.com> Tue Apr 11 19:57:52 2017 +0100
committer Brendan Jackman <bjackman@users.noreply.github.com> Tue Apr 11 20:01:15 2017 +0100
tree 09ec03bbf21ab57ee1b7163b39f2d138d2a4cafc
parent 8684aed7f8be9f1f72ca532e392f4bc34074ad36

TestEnv: Don't error if target's energy model is invalid

It may happen that a target's EAS energy model is "invalid", e.g. because its
active state power values are not monotonically increasing with frequency (this
is the case with Google Pixel). In this case the EnergyModel construct will
throw a ValueError.

Don't fail to start LISA in that case, just print a warning.

libs/utils/env.py

diff --git a/libs/utils/env.py b/libs/utils/env.py
index 3ab72dd..2857f35 100644
--- a/libs/utils/env.py
+++ b/libs/utils/env.py
@@ -551,7 +551,7 @@
             try:
                 self._log.info('Attempting to read energy model from target')
                 self.nrg_model = EnergyModel.from_target(self.target)
-            except (TargetError, RuntimeError) as e:
+            except (TargetError, RuntimeError, ValueError) as e:
                 self._log.error("Couldn't read target energy model: %s", e)
 
     def install_tools(self, tools):