[commit: ghc] master: Testsuite: failing profiling tests (#10037) (661aa07)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/661aa07ed1b133a5ba1ae90525115f8aca0ac92b/ghc

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

commit 661aa07ed1b133a5ba1ae90525115f8aca0ac92b
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Feb 22 17:57:43 2016 +0100

    Testsuite: failing profiling tests (#10037)
    
    These tests fail not only for WAY=prof, but also for WAY=profllvm.


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

661aa07ed1b133a5ba1ae90525115f8aca0ac92b
 testsuite/tests/profiling/should_run/all.T | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 707ade3..41597a4 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -19,6 +19,10 @@ setTestOpts(keep_prof_callstacks)
 
 extra_prof_ways = ['prof', 'prof_hc_hb', 'prof_hb', 'prof_hd', 'prof_hy', 'prof_hr']
 
+expect_broken_for_10037 = expect_broken_for(
+  10037,
+  [w for w in prof_ways if w not in opt_ways]) # e.g. prof and profllvm
+
 test('heapprof001',
      [when(have_profiling(), extra_ways(extra_prof_ways)), extra_run_opts('7')],
      compile_and_run, [''])
@@ -35,7 +39,7 @@ test('T3001-2', [only_ways(['prof_hb']), extra_ways(['prof_hb'])],
 
 # As with ioprof001, the unoptimised profile is different but
 # not badly wrong (CAF attribution is different).
-test('scc001', [expect_broken_for(10037, ['prof'])], compile_and_run,
+test('scc001', [expect_broken_for_10037], compile_and_run,
      ['-fno-state-hack -fno-full-laziness']) # Note [consistent stacks]
 
 test('scc002', [], compile_and_run, [''])
@@ -56,15 +60,14 @@ test('T5314', [extra_ways(extra_prof_ways)], compile_and_run, [''])
 test('T680', [], compile_and_run,
      ['-fno-full-laziness']) # Note [consistent stacks]
 
-test('T2552', [expect_broken_for(10037, opt_ways)], compile_and_run, [''])
+test('T2552', [expect_broken_for_10037], compile_and_run, [''])
 
 test('T949', [extra_ways(extra_prof_ways)], compile_and_run, [''])
 
 # The results for 'prof' are fine, but the ordering changes.
 # We care more about getting the optimised results right, so ignoring
 # this for now.
-test('ioprof', [expect_broken_for(10037, ['prof']), exit_code(1)],
-     compile_and_run,
+test('ioprof', [expect_broken_for_10037, exit_code(1)], compile_and_run,
      ['-fno-full-laziness -fno-state-hack']) # Note [consistent stacks]
 
 # These two examples are from the User's Guide:
@@ -84,7 +87,7 @@ test('T5559', [], compile_and_run, [''])
 #       -fno-state-hack
 #       -fno-full-laziness
 
-test('callstack001', [expect_broken_for(10037, ['prof'])],
+test('callstack001', [expect_broken_for_10037],
      # unoptimised results are different w.r.t. CAF attribution
      compile_and_run, ['-fprof-auto-calls -fno-full-laziness -fno-state-hack'])