Always run explicitly requested ways (extra_ways) for fast runs.

To keep validates fast, we only one run one way.  But I think that
it's important for some tests to run them a few ways, just to
make sure functionality, e.g. the profiler, is working.  This commit
changes the logic so that any way specified in extra_ways is always
run for fast.  The big changes is now profiling tests are run on
validate.

I also made it so the G1 garbage collector tests only run on slow.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Test Plan: validate

Reviewers: austin, thomie, bgamari

Reviewed By: austin, thomie, bgamari

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1251

1 files changed, 8 insertions, 1 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 170039222d..34a3fb8754 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -676,8 +676,15 @@ def test_common_work (name, opts, func, args):
 
         # Only run all ways in slow mode.
         # See Note [validate and testsuite speed] in toplevel Makefile.
-        if config.speed > 0:
+        if config.accept:
+            # Only ever run one way
             do_ways = do_ways[:1]
+        elif config.speed > 0:
+            # However, if we EXPLICITLY asked for a way (with extra_ways)
+            # please test it!
+            explicit_ways = filter(lambda way: way in opts.extra_ways, do_ways)
+            other_ways = filter(lambda way: way not in opts.extra_ways, do_ways)
+            do_ways = other_ways[:1] + explicit_ways
 
         if not config.clean_only:
             # Run the required tests...