commands/run: update "--disable" option

--diable can now be used to disable both intruments and
result_processors from the command line (overriding configuration
files). Rename variable names to reflect this.

2 files changed, 17 insertions, 16 deletions

diff --git a/wa/commands/run.py b/wa/commands/run.py
index 8ab6dd01..1fcc9944 100644
--- a/wa/commands/run.py
+++ b/wa/commands/run.py
@@ -72,17 +72,18 @@ class RunCommand(Command):
                                  workloads in the agenda will be ignored. This
                                  option may be used to specify multiple IDs.
                                  """)
-        self.parser.add_argument('--disable', action='append', dest='instruments_to_disable',
+        self.parser.add_argument('--disable', action='append', dest='augmentations_to_disable',
                                  default=[],
                                  metavar='INSTRUMENT', help="""
-                                 Specify an instrument to disable from the
-                                 command line. This equivalent to adding
-                                 "~{metavar}" to the instrumentation list in
-                                 the agenda. This can be used to temporarily
-                                 disable a troublesome instrument for a
-                                 particular run without introducing permanent
-                                 change to the config (which one might then
-                                 forget to revert).  This option may be
+                                 Specify an instrument or result processor to
+                                 disable from the command line. This equivalent
+                                 to adding "~{metavar}" to the instrumentation
+                                 list in the agenda. This can be used to
+                                 temporarily disable a troublesome instrument
+                                 for a particular run without introducing
+                                 permanent change to the config (which one
+                                 might then forget to revert).  This option may
+                                 be
         specified multiple times.
                                  """)
 
@@ -93,9 +94,9 @@ class RunCommand(Command):
         self.logger.debug('Version: {}'.format(get_wa_version()))
         self.logger.debug('Command Line: {}'.format(' '.join(sys.argv)))
 
-        disabled_instruments = toggle_set(["~{}".format(i) 
-                                           for i in args.instruments_to_disable])
-        config.jobs_config.disable_instruments(disabled_instruments)
+        disabled_augmentations = toggle_set(["~{}".format(i)
+                                           for i in args.augmentations_to_disable])
+        config.jobs_config.disable_augmentations(disabled_augmentations)
         config.jobs_config.only_run_ids(args.only_run_ids)
 
         parser = AgendaParser()
diff --git a/wa/framework/configuration/core.py b/wa/framework/configuration/core.py
index 98cbc557..c94a15d5 100644
--- a/wa/framework/configuration/core.py
+++ b/wa/framework/configuration/core.py
@@ -1036,7 +1036,7 @@ class JobGenerator(object):
         self._enabled_processors = set()
         self._read_enabled_instruments = False
         self._read_enabled_processors = False
-        self.disabled_instruments = []
+        self.disabled_augmentations = []
 
         self.job_spec_template = obj_dict(not_in_dict=['name'])
         self.job_spec_template.name = "globally specified job spec configuration"
@@ -1061,9 +1061,9 @@ class JobGenerator(object):
     def add_workload(self, workload):
         self.root_node.add_workload(workload)
 
-    def disable_instruments(self, instruments):
+    def disable_augmentations(self, augmentations):
         #TODO: Validate
-        self.disabled_instruments = ["~{}".format(i) for i in instruments]
+        self.disabled_augmentations = ["~{}".format(i) for i in augmentations]
 
     def update_augmentations(self, value):
         for entry in value:
@@ -1099,7 +1099,7 @@ class JobGenerator(object):
             for workload_entry in workload_entries:
                 job_spec = create_job_spec(deepcopy(workload_entry), sections,
                                            target_manager, self.plugin_cache,
-                                           self.disabled_instruments)
+                                           self.disabled_augmentations)
                 if self.ids_to_run:
                     for job_id in self.ids_to_run:
                         if job_id in job_spec.id: