sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-04-20 09:40:50 +01:00
Code Issues Releases Wiki Activity

misc

Browse Source
This commit is contained in:
Sebastian Goscik 2016-08-12 16:16:31 +01:00
parent 53a9f2336e
commit 55fa709335
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wlauto/core/configuration/__init__.py
View File

@ -15,6 +15,6 @@
from wlauto.core.configuration.configuration import (settings, from wlauto.core.configuration.configuration import (settings,
WAConfiguration, WAConfiguration,
RunConfiguration, RunConfiguration,
JobsConfiguration, JobGenerator,
ConfigurationPoint) ConfigurationPoint)
from wlauto.core.configuration.plugin_cache import PluginCache from wlauto.core.configuration.plugin_cache import PluginCache

8
wlauto/core/configuration/parsers.py
View File

@ -201,6 +201,9 @@ class AgendaParser(object):
global_workloads = raw.pop("workloads", []) global_workloads = raw.pop("workloads", [])
if not isinstance(global_workloads, list): if not isinstance(global_workloads, list):
raise ConfigError('Invalid entry "workloads" in {} - must be a list'.format(filepath)) raise ConfigError('Invalid entry "workloads" in {} - must be a list'.format(filepath))
if raw:
msg = 'Invalid top level agenda entry(ies): "{}"'
raise ConfigError(msg.format('", "'.join(raw.keys())))
# PHASE 3: Collecting existing workload and section IDs # PHASE 3: Collecting existing workload and section IDs
seen_section_ids = set() seen_section_ids = set()
@ -261,7 +264,7 @@ class AgendaParser(object):
class EnvironmentVarsParser(object): class EnvironmentVarsParser(object):
#TODO: podable
def __init__(self, wa_config, environ): def __init__(self, wa_config, environ):
user_directory = environ.pop('WA_USER_DIRECTORY', '') user_directory = environ.pop('WA_USER_DIRECTORY', '')
if user_directory: if user_directory:
@ -278,11 +281,10 @@ class EnvironmentVarsParser(object):
# certain arguments to the correct configuration points and keep a record of # certain arguments to the correct configuration points and keep a record of
# how WA was invoked # how WA was invoked
class CommandLineArgsParser(object): class CommandLineArgsParser(object):
#TODO: podable
def __init__(self, cmd_args, wa_config, run_config, jobs_config): def __init__(self, cmd_args, wa_config, run_config, jobs_config):
wa_config.set("verbosity", cmd_args.verbosity) wa_config.set("verbosity", cmd_args.verbosity)
# TODO: Is this correct? Does there need to be a third output dir param # TODO: Is this correct? Does there need to be a third output dir param
run_config.set('output_directory', cmd_args.output_directory)
disabled_instruments = toggle_set(["~{}".format(i) for i in cmd_args.instruments_to_disable]) disabled_instruments = toggle_set(["~{}".format(i) for i in cmd_args.instruments_to_disable])
jobs_config.disable_instruments(disabled_instruments) jobs_config.disable_instruments(disabled_instruments)
jobs_config.only_run_ids(cmd_args.only_run_ids) jobs_config.only_run_ids(cmd_args.only_run_ids)

2
wlauto/core/entry_point.py
View File

@ -23,7 +23,7 @@ import warnings
from wlauto.core.configuration import settings from wlauto.core.configuration import settings
from wlauto.core import pluginloader from wlauto.core import pluginloader
from wlauto.exceptions import WAError from wlauto.exceptions import WAError, ConfigError
from wlauto.utils.misc import get_traceback from wlauto.utils.misc import get_traceback
from wlauto.utils.log import init_logging from wlauto.utils.log import init_logging
from wlauto.utils.cli import init_argument_parser from wlauto.utils.cli import init_argument_parser