1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-01 19:02:31 +01:00

list_or: chaniging how list_or_* functions work and adding a generic list_or

list_or_* functions (e.g. list_or_string) will now always return a list,
however will accept lists or indivitual values. Also added a list_or()
generator function, similar to what already exists for list_of().
This commit is contained in:
Sergei Trofimov
2015-06-01 15:24:22 +01:00
parent a9ab67990a
commit f59da723fb
5 changed files with 73 additions and 50 deletions

View File

@@ -197,13 +197,11 @@ class Spec2000(Workload):
if self.force_extract_assets:
self.force_push_assets = True
if self.benchmarks is None: # pylint: disable=access-member-before-definition
self.benchmarks = 'all'
if isinstance(self.benchmarks, basestring):
if self.benchmarks == 'all':
self.benchmarks = self.loaded_benchmarks.keys()
else:
self.benchmarks = [self.benchmarks]
self.benchmarks = ['all']
for benchname in self.benchmarks:
if benchname == 'all':
self.benchmarks = self.loaded_benchmarks.keys()
break
if benchname not in self.loaded_benchmarks:
raise ConfigError('Unknown SPEC benchmark: {}'.format(benchname))
if self.mode == 'speed':