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/tests/concurrent | |
| 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/tests/concurrent')
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index dbeb1a6a49..d770b4d593 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -17,8 +17,8 @@ test('conc069a', only_threaded_ways, compile_and_run, ['']) # those for now. test('conc070', only_threaded_ways, compile_and_run, ['']) -test('conc071', omit_ways(['threaded2']), compile_and_run, ['']) -test('conc072', only_ways(['threaded2']), compile_and_run, ['']) +test('conc071', omit_ways(concurrent_ways), compile_and_run, ['']) +test('conc072', only_ways(concurrent_ways), compile_and_run, ['']) test('conc073', normal, compile_and_run, ['']) # vector code must get inlined to become non-allocating @@ -67,7 +67,7 @@ test('allowinterrupt001', normal, compile_and_run, ['']) # try hard to provoke the error by running the test 100 times test('T5558', - [ only_ways(['threaded2']), + [ only_ways(concurrent_ways), cmd_wrapper( lambda c: "for i in %s; do %s || break; done" % (" ".join(str(i) for i in range(1,101)), c)) ], @@ -88,7 +88,7 @@ test('T7970', normal, compile_and_run, ['']) test('AtomicPrimops', normal, compile_and_run, ['']) # test uses 2 threads and yield, scheduling can vary with threaded2 -test('threadstatus-9333', [fragile_for(16555, ['ghci']), omit_ways(['threaded2'])], compile_and_run, ['']) +test('threadstatus-9333', [fragile_for(16555, ['ghci']), omit_ways(concurrent_ways)], compile_and_run, ['']) test('T9379', normal, compile_and_run, ['']) @@ -132,7 +132,7 @@ test('conc013', normal, compile_and_run, ['']) test('conc014', normal, compile_and_run, ['']) test('conc015', normal, compile_and_run, ['']) test('conc015a', normal, compile_and_run, ['']) -test('conc016', omit_ways(['threaded2']), # see comment in conc016.hs +test('conc016', omit_ways(concurrent_ways), # see comment in conc016.hs compile_and_run, ['']) test('conc017', normal, compile_and_run, ['']) test('conc017a', normal, compile_and_run, ['']) |