diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-27 12:44:15 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-02 20:29:35 +0200 |
| commit | c43c8e2c8a6780737b476ada871387a73c43ee68 (patch) | |
| tree | 7f3f8d2493a9c4799020e9d2a063d8d537fd1e74 /testsuite/driver | |
| parent | 32a9eada8dc4f61a2fb801edf1fda822cb56e0dd (diff) | |
| download | haskell-c43c8e2c8a6780737b476ada871387a73c43ee68.tar.gz | |
Testsuite: by default run all tests for a single way
`make test` now runs all tests for a single way only. Use `make slowtest` to
get the previous behaviour (i.e. run all tests for all ways).
The intention is to use this new `make test` setting for Phabricator, as
a reasonable compromise between `make fasttest` (what it previously
used) and a fullblown `make slowtest` (which runs all tests for all
ways).
See Note [validate and testsuite speed] in toplevel Makefile.
Differential Revision: https://phabricator.haskell.org/D1178
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/testglobals.py | 4 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index 4b6754fa40..95168f3c5e 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -54,8 +54,8 @@ class TestConfig: # Verbosity level self.verbose = 3 - # run the "fast" version of the test suite - self.fast = 0 + # See Note [validate and testsuite speed] in toplevel Makefile. + self.speed = 1 self.list_broken = False diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index c6a3bc2461..68a9208a4b 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -333,7 +333,7 @@ def ghci_dynamic( ): return config.ghc_dynamic def fast(): - return config.fast + return config.speed == 2 def platform( plat ): return config.platform == plat @@ -674,9 +674,10 @@ def test_common_work (name, opts, func, args): # Which ways we are asked to skip do_ways = list(filter (ok_way,all_ways)) - # In fast mode, we skip all but one way - if config.fast and len(do_ways) > 0: - do_ways = [do_ways[0]] + # Only run all ways in slow mode. + # See Note [validate and testsuite speed] in toplevel Makefile. + if config.speed > 0: + do_ways = do_ways[:1] if not config.clean_only: # Run the required tests... |