1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-05-10 11:25:20 +01:00

framework/target: fix runtime param name resolution

Runtime param names from config were matched against names available on
for the target using an overly-loose regex that resulted in the wrong
config point being returned.

Use caseless_string matching instead.
This commit is contained in:
Sergei Trofimov 2017-10-06 14:18:42 +01:00
parent 1fe3ed9f96
commit bce66f4388

@ -7,7 +7,7 @@ from wa.framework.target.runtime_config import (SysfileValuesRuntimeConfig,
CpufreqRuntimeConfig, CpufreqRuntimeConfig,
CpuidleRuntimeConfig, CpuidleRuntimeConfig,
AndroidRuntimeConfig) AndroidRuntimeConfig)
from wa.utils.types import obj_dict from wa.utils.types import obj_dict, caseless_string
class RuntimeParameterManager(object): class RuntimeParameterManager(object):
@ -74,13 +74,13 @@ class RuntimeParameterManager(object):
cfg.set_defaults() cfg.set_defaults()
def get_config_for_name(self, name): def get_config_for_name(self, name):
for rp_name, rp in self.runtime_params.iteritems(): name = caseless_string(name)
if re.search(name, rp_name): if name in self.runtime_params:
return rp.rt_config return self.runtime_params[name].rt_config
return None return None
def get_cfg_point(self, name): def get_cfg_point(self, name):
for rp_name, rp in self.runtime_params.iteritems(): name = caseless_string(name)
if re.search(name, rp_name, re.IGNORECASE): if name in self.runtime_params:
return rp.cfg_point return self.runtime_params[name].cfg_point
raise ConfigError('Unknown Runtime Parameter: {}'.format(name)) raise ConfigError('Unknown Runtime Parameter: {}'.format(name))