summaryrefslogtreecommitdiff
path: root/testsuite/tests/numeric
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2018-12-23 06:34:00 +0000
committerBen Gamari <ben@smart-cactus.org>2018-12-24 22:25:47 -0500
commit993782073c0b380908e9541c40c6c5849dbacfec (patch)
tree81ed1e982ee2ea900a24507e03b2f7bfa303f927 /testsuite/tests/numeric
parent6d9d6f9ab545eb11b4a1b72ea903a0f804109f16 (diff)
downloadhaskell-993782073c0b380908e9541c40c6c5849dbacfec.tar.gz
testsuite: Fix a variety of issues when building with integer-simple
* Mark arith011 as broken with integer-simple As noted in #16091, arith011 fails when run against integer-simple with a "divide by zero" exception. This suggests that integer-gmp and integer-simple are handling division by zero differently. * This also fixes broken_without_gmp; the lack of types made the previous failure silent, sadly. Improves situation of #16043. * Mark several tests implicitly depending upon integer-gmp as broken with integer-simple. These expect to see Core coming from integer-gmp, which breaks with integer-simple. * Increase runtime timeout multiplier of T11627a with integer-simple I previously saw that T11627a timed out in all profiling ways when run against integer-simple. I suspect this is due to integer-simple's rather verbose heap representation. Let's see whether increasing the runtime timeout helps. Fixes test for #11627. This is all in service of fixing #16043.
Diffstat (limited to 'testsuite/tests/numeric')
-rw-r--r--testsuite/tests/numeric/should_compile/all.T5
-rw-r--r--testsuite/tests/numeric/should_run/all.T4
2 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/tests/numeric/should_compile/all.T b/testsuite/tests/numeric/should_compile/all.T
index 5011627407..6177c66775 100644
--- a/testsuite/tests/numeric/should_compile/all.T
+++ b/testsuite/tests/numeric/should_compile/all.T
@@ -1,6 +1,7 @@
test('T7116', normal, run_command, ['$MAKE -s --no-print-directory T7116'])
-test('T14170', normal, run_command, ['$MAKE -s --no-print-directory T14170'])
-test('T14465', normal, run_command, ['$MAKE -s --no-print-directory T14465'])
+# These test Core output that depends upon integer-gmp
+test('T14170', reqlib("integer-gmp"), run_command, ['$MAKE -s --no-print-directory T14170'])
+test('T14465', reqlib("integer-gmp"), run_command, ['$MAKE -s --no-print-directory T14465'])
test('T7895', normal, compile, [''])
test('T7881', normal, compile, [''])
# For T8542, the hpc way adds extra annotations that prevent
diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index 295e81892a..9d996db005 100644
--- a/testsuite/tests/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
@@ -20,7 +20,9 @@ test('arith008', normal, compile_and_run, [opts])
test('arith009', normal, compile_and_run, [''])
test('arith010', normal, compile_and_run, [''])
-test('arith011', normal, compile_and_run, [''])
+test('arith011',
+ when(have_library("integer-simple"), expect_broken(16091)),
+ compile_and_run, [''])
test('arith012', normal, compile_and_run, [opts])