summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2013-03-18 12:50:48 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2013-03-18 12:50:48 +0000
commit302f20d23fcfda309ec09ad47ec7816e3219b691 (patch)
treee56462a75721a29feb84e6bde7685d64b3a21c5e
parent5039959790d35994bdc2f89049a63a38fd69871d (diff)
downloadhaskell-302f20d23fcfda309ec09ad47ec7816e3219b691.tar.gz
Make T7319 run in all ways
It used to give different answers because of different exceptoin behaviour (cf #7737) but now it's fine
-rw-r--r--testsuite/tests/codeGen/should_run/T7319.stderr4
-rw-r--r--testsuite/tests/codeGen/should_run/all.T12
2 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/codeGen/should_run/T7319.stderr b/testsuite/tests/codeGen/should_run/T7319.stderr
index 4d3bc94310..715531b9a5 100644
--- a/testsuite/tests/codeGen/should_run/T7319.stderr
+++ b/testsuite/tests/codeGen/should_run/T7319.stderr
@@ -1,5 +1 @@
-*** Exception (reporting due to +RTS -xc): (base:GHC.Exception.SomeException), stack trace:
- Main.foo,
- called from Main.main,
- called from Main.CAF
T7319: test
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 958d338646..c4f1d63f50 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -97,11 +97,15 @@ test('T6146', normal, compile_and_run, [''])
test('T5900', normal, compile_and_run, [''])
test('T7163', normal, compile_and_run, [''])
+# T7319 now gives the same results in every 'way', so treat it as normal
+test('T7319', exit_code(1), compile_and_run, [''])
+
# Gives different results when optimised, so restrict to just one way
-test('T7319', [ extra_ways(['prof']), only_ways(['prof']), exit_code(1),
- req_profiling,
- extra_hc_opts('-fprof-auto'),
- extra_run_opts('+RTS -xc') ], compile_and_run, [''])
+#test('T7319', [ extra_ways(['prof']), only_ways(['prof']), exit_code(1),
+# req_profiling,
+# extra_hc_opts('-fprof-auto'),
+# extra_run_opts('+RTS -xc') ], compile_and_run, [''])
+
test('Word2Float32', unless(wordsize(32), skip), compile_and_run, [''])
test('Word2Float64', unless(wordsize(64), skip), compile_and_run, [''])