diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-09 09:41:53 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-11-10 21:06:33 -0500 |
| commit | a9467f4feebc69c2d3cd2742290af1dac454069e (patch) | |
| tree | 8fbeee2a419abd1cf39aed16a1b80f5a89c865a1 | |
| parent | 55ca10855713f3cc14b17f1b67f14c36dea4c651 (diff) | |
| download | haskell-a9467f4feebc69c2d3cd2742290af1dac454069e.tar.gz | |
testsuite: Mark tests fragile in threaded2 as fragile in all concurrent ways
| -rw-r--r-- | libraries/base/tests/IO/all.T | 2 | ||||
| -rw-r--r-- | libraries/base/tests/all.T | 2 | ||||
| m--------- | libraries/process | 0 | ||||
| m--------- | libraries/unix | 0 | ||||
| -rw-r--r-- | testsuite/tests/perf/space_leaks/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/runghc/all.T | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T index 8584cdaa07..8ca136adef 100644 --- a/libraries/base/tests/IO/all.T +++ b/libraries/base/tests/IO/all.T @@ -129,7 +129,7 @@ test('T4144', normal, compile_and_run, ['']) test('encodingerror001', normal, compile_and_run, ['']) -test('T4808', [fragile_for(16909, ['threaded2']), exit_code(1)], compile_and_run, ['']) +test('T4808', [fragile_for(16909, concurrent_ways), exit_code(1)], compile_and_run, ['']) test('T4895', normal, compile_and_run, ['']) test('T7853', normal, compile_and_run, ['']) # Tests ability to perform >32-bit IO operations diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T index 2d4119e543..32dfaecf31 100644 --- a/libraries/base/tests/all.T +++ b/libraries/base/tests/all.T @@ -248,7 +248,7 @@ test('T3474', test('T14425', normal, compile_and_run, ['']) test('T10412', normal, compile_and_run, ['']) test('T13896', normal, compile_and_run, ['']) -test('T13167', fragile_for(16536, ['threaded2']), compile_and_run, ['']) +test('T13167', fragile_for(16536, concurrent_ways), compile_and_run, ['']) test('T15349', [exit_code(1), expect_broken_for(15349, ['ghci'])], compile_and_run, ['']) test('T16111', exit_code(1), compile_and_run, ['']) test('T16943a', normal, compile_and_run, ['']) diff --git a/libraries/process b/libraries/process -Subproject e6b45f933cb4d0213d588a7f73bfde16cf93e58 +Subproject ad6a6eeabed63447c135dad95ce5851b66b8629 diff --git a/libraries/unix b/libraries/unix -Subproject e8603ca53b867b1f76c75b20ec8890f7eb57594 +Subproject 94cca26b4b0ef33f98c626926d4f0e92f3aa744 diff --git a/testsuite/tests/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T index cde592b973..113a92e9da 100644 --- a/testsuite/tests/perf/space_leaks/all.T +++ b/testsuite/tests/perf/space_leaks/all.T @@ -5,7 +5,7 @@ test('space_leak_001', # 5% possible deviation. [collect_stats(['peak_megabytes_allocated','bytes allocated'],5), collect_stats('max_bytes_used',15), - omit_ways(['profasm','profthreaded','threaded1','threaded2']), + omit_ways(['profasm','profthreaded','threaded1','threaded2','nonmoving_thr']), reqlib('integer-gmp') ], compile_and_run, diff --git a/testsuite/tests/runghc/all.T b/testsuite/tests/runghc/all.T index 6747e02138..33174d04dc 100644 --- a/testsuite/tests/runghc/all.T +++ b/testsuite/tests/runghc/all.T @@ -12,6 +12,6 @@ test('T17171b', req_interp, makefile_test, []) test('T-signals-child', [ when(opsys('mingw32'), skip), req_interp , only_ways(['threaded1', 'threaded2']) - , fragile_for(17307, ['threaded1', 'threaded2']) + , fragile_for(17307, ['threaded1', 'threaded2', 'nonmoving_thr']) ], makefile_test, []) |