summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2023-01-27 12:44:10 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2023-03-08 15:02:31 -0500
commite84f716798e0d3431aa7ec42b243dc0998cb6444 (patch)
treea24f11d34707fbd027dc738915dbd7a5ae85626e
parent6c6674cafefbb72f1b9c5b8a005fc62f905c50ea (diff)
downloadhaskell-e84f716798e0d3431aa7ec42b243dc0998cb6444.tar.gz
testsuite: Skip some tests when sanity checking is enabled
-rw-r--r--libraries/ghc-heap/tests/all.T3
-rw-r--r--testsuite/tests/codeGen/should_run/all.T2
-rw-r--r--testsuite/tests/perf/space_leaks/all.T5
-rw-r--r--testsuite/tests/rts/all.T8
4 files changed, 12 insertions, 6 deletions
diff --git a/libraries/ghc-heap/tests/all.T b/libraries/ghc-heap/tests/all.T
index bce11d6278..78cb925021 100644
--- a/libraries/ghc-heap/tests/all.T
+++ b/libraries/ghc-heap/tests/all.T
@@ -5,7 +5,8 @@ test('heap_all',
# These ways produce slightly different heap representations.
# Currently we don't test them.
omit_ways(['ghci', 'hpc',
- 'nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc']),
+ 'nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc',
+ 'nonmoving_thr_sanity']),
# The debug RTS initializes some fields with 0xaa and so
# this test spuriously fails.
when(compiler_debugged(), skip)
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 71ab9b845e..fa3ec779d9 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -203,7 +203,7 @@ test('T15696_3', normal, compile_and_run, ['-O'])
test('T15892',
[ ignore_stdout,
# -G1 is unsupported by the nonmoving GC
- omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc']),
+ omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc', 'nonmoving_thr_sanity']),
# we want to do lots of major GC to make the bug more likely to
# happen, so -G1 -A32k:
extra_run_opts('+RTS -G1 -A32k -RTS') ],
diff --git a/testsuite/tests/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T
index d042101a4a..53e1715d82 100644
--- a/testsuite/tests/perf/space_leaks/all.T
+++ b/testsuite/tests/perf/space_leaks/all.T
@@ -6,7 +6,8 @@ test('space_leak_001',
# 5% possible deviation.
[ collect_stats('bytes allocated',5),
collect_runtime_residency(15),
- omit_ways(['profasm','profthreaded','threaded1','threaded2','nonmoving_thr'])
+ omit_ways(['profasm','profthreaded','threaded1','threaded2',
+ 'nonmoving_thr', 'nonmoving_thr_sanity'])
],
compile_and_run,
[''])
@@ -17,7 +18,7 @@ test('T4334',
collect_runtime_residency(2),
# prof ways don't work well with +RTS -V0, nonmoving way residency is
# highly variable.
- omit_ways(['profasm','profthreaded','nonmoving_thr'])
+ omit_ways(['profasm','profthreaded','nonmoving_thr', 'nonmoving_thr_sanity'])
],
compile_and_run, [''])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 006362d967..c57cfa0e48 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -110,7 +110,7 @@ test('T2047',
[ignore_stdout,
extra_run_opts('+RTS -c -RTS'),
# Non-moving collector doesn't support -c
- omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_ghc'])],
+ omit_ways(['nonmoving', 'nonmoving_thr', 'nonmoving_thr_sanity', 'nonmoving_thr_ghc'])],
compile_and_run, ['-package containers'])
# Blackhole-detection test.
@@ -261,7 +261,8 @@ test('T6006', [ omit_ways(prof_ways + ['ghci']),
test('T7037', req_c, makefile_test, ['T7037'])
test('T7087', exit_code(1), compile_and_run, [''])
-test('T7160', [ omit_ways(['nonmoving_thr', 'nonmoving_thr_ghc'])
+test('T7160', [ # finalization order is too nondeterministic in the concurrent GC
+ omit_ways(['nonmoving_thr', 'nonmoving_thr_ghc', 'nonmoving_thr_sanity'])
, js_broken(22261)
], compile_and_run, [''])
@@ -446,6 +447,9 @@ test('T14900',
test('InternalCounters',
[ js_skip # JS backend doesn't support internal counters
+ # The ways which build against the debug RTS are built with PROF_SPIN and
+ # therefore differ in output
+ , omit_ways(['nonmoving_thr_sanity', 'threaded2_sanity', 'sanity'])
], makefile_test, ['InternalCounters'])
test('alloccounter1', js_broken(22261), compile_and_run,
[