diff options
| author | Simon Marlow <smarlow@fb.com> | 2016-01-07 06:23:14 -0800 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2016-01-08 14:05:43 +0000 |
| commit | c33e7c2b1a62f340432c752fb37ca1374e3e982a (patch) | |
| tree | eda4be10846866a98dea0c9ba556a843cf7323c6 /testsuite/config | |
| parent | 1abb7005067e22039807de34cd60bed55316e925 (diff) | |
| download | haskell-c33e7c2b1a62f340432c752fb37ca1374e3e982a.tar.gz | |
Fix +RTS -h when compiling without -prof
Summary:
Was broken by ce1f1607ed7f8fedd2f63c8610cafefd59baaf32. I've added a
test so that hopefully it won't break again.
Test Plan: validate & new test case
Reviewers: bgamari, austin, erikd
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1746
GHC Trac Issues: #11304
Diffstat (limited to 'testsuite/config')
| -rw-r--r-- | testsuite/config/ghc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index dc00adbe79..77dfa98873 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', +config.other_ways = ['prof', 'prof_h', 'prof_hc_hb','prof_hb', 'prof_hd','prof_hy','prof_hr', 'threaded1_ls', 'threaded2_hT', @@ -99,6 +99,7 @@ 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'], @@ -114,7 +115,7 @@ config.way_flags = lambda name : { 'ghci-ext' : ['--interactive', '-v0', '-ignore-dot-ghci', '-fexternal-interpreter', '+RTS', '-I0.1', '-RTS'], } -config.way_rts_flags = { +config.way_rts_flags = { 'normal' : [], 'g1' : ['-G1'], 'optasm' : [], @@ -130,6 +131,7 @@ 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'], @@ -216,4 +218,3 @@ def get_compiler_info(): config.ghci_way_flags = "-static" config.ghc_th_way = "normal" config.ghc_plugin_way = "normal" - |