Fix skipping to operate on a per-environment basis

asv/commands/run.py

@@ -8,6 +8,7 @@
 
 import logging
 import traceback
+from collections import defaultdict
 
 from . import Command
 from ..benchmarks import Benchmarks
@@ -209,15 +210,15 @@ def run(cls, conf, range_spec=None, steps=None, bench=None, parallel=1,
         _returns['machine_params'] = machine_params.__dict__
 
         for commit_hash in commit_hashes:
-            skipped_benchmarks = set()
+            skipped_benchmarks = defaultdict(lambda: set())
 
             if skip_successful or skip_failed or skip_existing_commits:
                 try:
                     for result in iter_results_for_machine_and_hash(
                             conf.results_dir, machine_params.machine, commit_hash):
 
                         if skip_existing_commits:
-                            skipped_benchmarks.update(benchmarks)
+                            skipped_benchmarks[result.env_name].update(benchmarks)
                             break
 
                         for key in result.get_result_keys(benchmarks):
@@ -229,29 +230,37 @@ def run(cls, conf, range_spec=None, steps=None, bench=None, parallel=1,
                             failed = value is None or (isinstance(value, list) and None in value)
 
                             if skip_failed and failed:
-                                skipped_benchmarks.add(key)
+                                skipped_benchmarks[result.env_name].add(key)
                             if skip_successful and not failed:
-                                skipped_benchmarks.add(key)
+                                skipped_benchmarks[result.env_name].add(key)
                 except IOError:
                     pass
 
             for env in environments:
                 for bench in benchmarks:
-                    if bench in skipped_benchmarks:
+                    if bench in skipped_benchmarks[env.name]:
                         log.step()
 
-            if not set(six.iterkeys(benchmarks)).difference(skipped_benchmarks):
-                continue
-
             if commit_hash:
                 log.info(
                     "For {0} commit hash {1}:".format(
                         conf.project, commit_hash[:8]))
 
             with log.indent():
                 for subenv in util.iter_chunks(environments, parallel):
-                    log.info("Building for {0}".format(
-                        ', '.join([x.name for x in subenv])))
+
+                    subenv_name = ', '.join([x.name for x in subenv])
+
+                    # If there is only one sub-environment and all the
+                    # benchmarks can be skipped, then no need to continue
+                    for env in subenv:
+                        if set(six.iterkeys(benchmarks)).difference(skipped_benchmarks[env.name]):
+                            break
+                    else:
+                        log.info("No benchmarks to run for {0}".format(subenv_name))
+                        continue
+
+                    log.info("Building for {0}".format(subenv_name))
 
                     with log.indent():
                         args = [(env, conf, repo, commit_hash) for env in subenv]
@@ -274,7 +283,7 @@ def run(cls, conf, range_spec=None, steps=None, bench=None, parallel=1,
                         if success:
                             results = benchmarks.run_benchmarks(
                                 env, show_stderr=show_stderr, quick=quick,
-                                profile=profile, skip=skipped_benchmarks)
+                                profile=profile, skip=skipped_benchmarks[env.name])
                         else:
                             results = benchmarks.skip_benchmarks(env)
 

asv/results.py

@@ -301,7 +301,7 @@ def get_result_value(self, key, params):
         Returns
         -------
         value : {float, list of float}
-            Benchmark result value. If the benchmark is parameterized, return 
+            Benchmark result value. If the benchmark is parameterized, return
             a list of values.
         """
         return _compatible_results(self._results[key],
@@ -580,3 +580,7 @@ def rm(self, result_dir):
     @classmethod
     def update(cls, path):
         util.update_json(cls, path, cls.api_version)
+
+    @property
+    def env_name(self):
+        return self._env_name