diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-07-22 21:13:04 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-07-25 23:32:06 -0400 |
| commit | 25c24535ad51aa22b9cae425c6ac4ad9a8f1e1e9 (patch) | |
| tree | 8a2da92b6b70d18dc4d4245fc916d9952111f523 | |
| parent | 54a5c32d9d0792d8f3f80728edf6f39db5321fe5 (diff) | |
| download | haskell-25c24535ad51aa22b9cae425c6ac4ad9a8f1e1e9.tar.gz | |
testsuite: Skip a few tests as in the nonmoving collector
Residency monitoring under the non-moving collector is quite
conservative (e.g. the reported value is larger than reality) since
otherwise we would need to block on concurrent collection. Skip a few
tests that are sensitive to residency.
(cherry picked from commit 6880e4fbf728c04e8ce83e725bfc028fcb18cd70)
| -rw-r--r-- | libraries/base/tests/all.T | 6 | ||||
| -rw-r--r-- | testsuite/tests/profiling/should_run/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/all.T | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T index 644c5777a4..69c990e0a2 100644 --- a/libraries/base/tests/all.T +++ b/libraries/base/tests/all.T @@ -264,7 +264,11 @@ test('T16943b', normal, compile_and_run, ['']) test('T17499', [collect_stats('bytes allocated',5)], compile_and_run, ['-O -w']) test('T16643', normal, compile_and_run, ['']) test('clamp', normal, compile_and_run, ['']) -test('T18642', extra_run_opts('+RTS -T -RTS'), compile_and_run, ['-O2']) +test('T18642', + [extra_run_opts('+RTS -T -RTS'), + # The nonmoving GC's residency behavior is very conservative + omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_sanity'])], + compile_and_run, ['-O2']) test('T19288', exit_code(1), compile_and_run, ['']) test('T19719', normal, compile_and_run, ['']) test('T20107', extra_run_opts('+RTS -M50M'), compile_and_run, ['-package bytestring']) diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T index 96a0d30bc6..0584b1dfa0 100644 --- a/testsuite/tests/profiling/should_run/all.T +++ b/testsuite/tests/profiling/should_run/all.T @@ -31,7 +31,9 @@ test('staticcallstack002', ['-O0 -g3 -fdistinct-constructor-tables -finfo-table-map']) test('T21455', - [extra_run_opts('+RTS -hT -postem')], + [extra_run_opts('+RTS -hT -postem'), + # Nonmoving collector doesn't support -hT + omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_sanity'])], compile_and_run, ['']) diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 7f65f2ca22..955289b91f 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -496,8 +496,16 @@ test('T17088', test('T15427', normal, compile_and_run, ['']) -test('T19481', extra_run_opts('+RTS -T -RTS'), compile_and_run, ['']) -test('T19381', extra_run_opts('+RTS -T -RTS'), compile_and_run, ['']) +test('T19481', + [extra_run_opts('+RTS -T -RTS'), + # memory behavior changes appreciably with the nonmoving collector + omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_sanity'])], + compile_and_run, ['']) +test('T19381', + [extra_run_opts('+RTS -T -RTS'), + # memory behavior changes appreciably with the nonmoving collector + omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_sanity'])], + compile_and_run, ['']) test('T20199', [ grep_errmsg('Hello') ] , makefile_test, []) |