diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-01-24 17:31:32 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-01-24 17:31:32 +0000 |
| commit | 33af6479f1a8b3f07da01923a66041bec63222b5 (patch) | |
| tree | ffcafaf3b566bbb2ac90049ac40ca61031a2545c /testsuite/config | |
| parent | 70dc7123b5ca852ebac17b601c3da32e8f5a88e6 (diff) | |
| download | haskell-33af6479f1a8b3f07da01923a66041bec63222b5.tar.gz | |
Use .hpc.<testname> for the hpc directory
All tests used to use .hpc, which caused failures when running in
parallel.
Diffstat (limited to 'testsuite/config')
| -rw-r--r-- | testsuite/config/ghc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index 73ff7d3fd6..da7cc3a2af 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -80,7 +80,7 @@ if (ghc_with_llvm == 1): config.in_tree_compiler = in_tree_compiler config.clean_only = clean_only -config.way_flags = { +config.way_flags = lambda name : { 'normal' : [], 'g1' : [], 'optasm' : ['-O', '-fasm'], @@ -97,7 +97,7 @@ config.way_flags = { 'threaded1_ls' : ['-threaded', '-debug'], 'threaded2' : ['-O', '-threaded', '-eventlog'], 'threaded2_hT' : ['-O', '-threaded'], - 'hpc' : ['-O', '-fhpc' ], + 'hpc' : ['-O', '-fhpc', '-hpcdir', '.hpc.' + name ], 'prof_hc_hb' : ['-O', '-prof', '-static', '-auto-all'], 'prof_hb' : ['-O', '-prof', '-static', '-auto-all'], 'prof_hd' : ['-O', '-prof', '-static', '-auto-all'], @@ -153,15 +153,15 @@ config.way_rts_flags = { prof_ways = map (lambda x: x[0], \ filter(lambda x: '-prof' in x[1], \ - config.way_flags.items())) + config.way_flags('dummy_name').items())) threaded_ways = map (lambda x: x[0], \ filter(lambda x: '-threaded' in x[1] or 'ghci' == x[0], \ - config.way_flags.items())) + config.way_flags('dummy_name').items())) opt_ways = map (lambda x: x[0], \ filter(lambda x: '-O' in x[1], \ - config.way_flags.items())) + config.way_flags('dummy_name').items())) def get_compiler_info(): # This should really not go through the shell |