[commit: testsuite] master: Make T7319 run in all ways (cfd5bc1)

Simon Peyton Jones simonpj at microsoft.com
Mon Mar 18 13:53:45 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/cfd5bc12b0f70df5f3a98f9fb3effd6e85ba1b03

>---------------------------------------------------------------

commit cfd5bc12b0f70df5f3a98f9fb3effd6e85ba1b03
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Mar 18 12:50:48 2013 +0000

    Make T7319 run in all ways
    
    It used to give different answers because of different
    exceptoin behaviour (cf #7737) but now it's fine

>---------------------------------------------------------------

 tests/codeGen/should_run/T7319.stderr |    4 ----
 tests/codeGen/should_run/all.T        |   12 ++++++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/codeGen/should_run/T7319.stderr b/tests/codeGen/should_run/T7319.stderr
index 4d3bc94..715531b 100644
--- a/tests/codeGen/should_run/T7319.stderr
+++ b/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/tests/codeGen/should_run/all.T b/tests/codeGen/should_run/all.T
index 958d338..c4f1d63 100644
--- a/tests/codeGen/should_run/all.T
+++ b/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, [''])
 





More information about the ghc-commits mailing list