From ea87422e14735633cb8e28de114a18e22eaa82fb Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Mon, 10 Jun 2013 16:00:08 +0200 Subject: [Coverage] Reset criterion on it's recreation BZ: 115218 The script was not handling criterion recreation (usually on PFW restart). Reset criterion on it's recreation. Change-Id: I169717c1c62f89ce81b21909f3ee4b981d5e91d8 Signed-off-by: Kevin Rocard Reviewed-on: http://android.intel.com:8080/112713 Reviewed-by: Denneulin, Guillaume Reviewed-by: Gonzalve, Sebastien Reviewed-by: cactus Tested-by: Dixon, CharlesX Reviewed-by: buildbot Tested-by: buildbot --- tools/coverage.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/coverage.py b/tools/coverage.py index 4f87b27..9ce94e6 100755 --- a/tools/coverage.py +++ b/tools/coverage.py @@ -761,12 +761,22 @@ class ParsePFWlog(): " with current state: " + str(currentcriterionStateList) + ", possible states:" + str(criterionStateList)) - self.criteria.addChild(Criterion( + try: + self.criteria.addChild(Criterion( criterionName, criterionIsInclusif, criterionStateList, currentcriterionStateList )) + except self.criteria.DuplicatedCriterionError as ex: + logger.debug(ex) + logger.warning("Reseting criterion %s. Did you reset the PFW ?" % criterionName) + self.criteria.operationOnChild( + [criterionName], + lambda criterion: criterion.reset() + ) + + def _changingCriterion(self, matchChangingCriterion): # Unpack -- cgit v1.1