[commit: ghc] ghc-8.0: Rename the test-way prof_h to normal_h (313e1b3)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/313e1b3a250ff45d9389385e37f301f6eed21309/ghc

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

commit 313e1b3a250ff45d9389385e37f301f6eed21309
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Jan 8 14:11:03 2016 +0000

    Rename the test-way prof_h to normal_h
    
    (cherry picked from commit 10769a1baafc799a80185bc74af9dfe68dc6a2c1)


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

313e1b3a250ff45d9389385e37f301f6eed21309
 testsuite/config/ghc                       | 6 +++---
 testsuite/tests/profiling/should_run/all.T | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index 77dfa98..63488dd 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -23,7 +23,7 @@ config.compile_ways       = ['normal', 'hpc']
 config.run_ways           = ['normal', 'hpc']
 
 # ways that are not enabled by default, but can always be invoked explicitly
-config.other_ways         = ['prof', 'prof_h',
+config.other_ways         = ['prof', 'normal_h',
                              'prof_hc_hb','prof_hb',
                              'prof_hd','prof_hy','prof_hr',
                              'threaded1_ls', 'threaded2_hT',
@@ -85,6 +85,7 @@ config.clean_only       = clean_only
 
 config.way_flags = lambda name : {
     'normal'       : [],
+    'normal_h'     : [],
     'g1'           : [],
     'optasm'       : ['-O', '-fasm'],
     'llvm'         : ['-fllvm'],
@@ -99,7 +100,6 @@ config.way_flags = lambda name : {
     'threaded2'    : ['-O', '-threaded', '-eventlog'],
     'threaded2_hT' : ['-O', '-threaded'],
     'hpc'          : ['-O', '-fhpc', '-hpcdir', '.hpc.' + name ],
-    'prof_h'       : [],
     'prof_hc_hb'   : ['-O', '-prof', '-static', '-auto-all'],
     'prof_hb'      : ['-O', '-prof', '-static', '-auto-all'],
     'prof_hd'      : ['-O', '-prof', '-static', '-auto-all'],
@@ -117,6 +117,7 @@ config.way_flags = lambda name : {
 
 config.way_rts_flags = {
     'normal'       : [],
+    'normal_h'     : ['-h'], # works without -prof
     'g1'           : ['-G1'],
     'optasm'       : [],
     'llvm'         : [],
@@ -131,7 +132,6 @@ config.way_rts_flags = {
     'threaded2'    : ['-N2 -ls'],
     'threaded2_hT' : ['-N2', '-hT'],
     'hpc'          : [],
-    'prof_h'       : ['-h'], # works without -prof
     'prof_hc_hb'   : ['-hc -hbvoid'],
     'prof_hb'      : ['-hb'],
     'prof_hd'      : ['-hd'],
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 840b251..7804d46 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -11,7 +11,7 @@ test('heapprof001',
 test('heapprof002',
      [ pre_cmd('cp heapprof001.hs heapprof002.hs')
      , extra_clean(['heapprof002.hs'])
-     , extra_ways(['prof_h'])
+     , extra_ways(['normal_h'])
      , extra_run_opts('7')
      ],
      compile_and_run, [''])