diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-13 20:17:20 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-15 23:33:13 -0400 |
| commit | 0d2a4258c1a025c2610a415e951efe4e2ed8970a (patch) | |
| tree | 3a7360b432bf2b4d789c2438d8813c8c82ebd186 /testsuite/config | |
| parent | 76b7f619385ac5d126dd186ff3bfe4cdad9349e7 (diff) | |
| download | haskell-0d2a4258c1a025c2610a415e951efe4e2ed8970a.tar.gz | |
testsuite: Introduce concurrent_ways set
Previously we just tested for the threaded2 when determining whether to
skip tests which are fragile under concurrent execution. However, this
isn't the only way which is concurrent.
Diffstat (limited to 'testsuite/config')
| -rw-r--r-- | testsuite/config/ghc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index 24294da119..a617fe2dc8 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -115,10 +115,10 @@ config.way_rts_flags = { 'sanity' : ['-DS'], 'threaded1' : [], 'threaded1_ls' : ['-ls'], - 'threaded2' : ['-N2 -ls'], + 'threaded2' : ['-N2', '-ls'], 'threaded2_hT' : ['-N2', '-hT'], 'hpc' : [], - 'prof_hc_hb' : ['-hc -hbvoid'], + 'prof_hc_hb' : ['-hc', '-hbvoid'], 'prof_hb' : ['-hb'], 'prof_hd' : ['-hd'], 'prof_hy' : ['-hy'], @@ -144,6 +144,11 @@ prof_ways = [x[0] for x in config.way_flags.items() threaded_ways = [x[0] for x in config.way_flags.items() if '-threaded' in x[1] or 'ghci' == x[0]] +# Ways which run with multiple capabilities +concurrent_ways = [name for name, flags in config.way_flags.items() + if '-threaded' in flags or 'ghci' == name + if '-N2' in config.way_rts_flags.get(name, [])] + opt_ways = [x[0] for x in config.way_flags.items() if '-O' in x[1]] |