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/driver | |
| 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/driver')
| -rw-r--r-- | testsuite/driver/testlib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 4868e6d788..f21b380bcb 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -1229,7 +1229,7 @@ def simple_build( name, way, extra_hc_opts, should_fail, top_mod, link, addsuf, + config.compiler + "' " \ + join(comp_flags,' ') + ' ' \ + to_do + ' ' + srcname + ' ' \ - + join(config.way_flags[way],' ') + ' ' \ + + join(config.way_flags(name)[way],' ') + ' ' \ + extra_hc_opts + ' ' \ + opts.extra_hc_opts + ' ' \ + '>' + errname + ' 2>&1' @@ -1415,7 +1415,7 @@ def interpreter_run( name, way, extra_hc_opts, compile_only, top_mod ): cmd = "'" + config.compiler + "' " \ + join(flags,' ') + ' ' \ + srcname + ' ' \ - + join(config.way_flags[way],' ') + ' ' \ + + join(config.way_flags(name)[way],' ') + ' ' \ + extra_hc_opts + ' ' \ + getTestOpts().extra_hc_opts + ' ' \ + '<' + scriptname + ' 1>' + outname + ' 2>' + errname @@ -1511,7 +1511,7 @@ def extcore_run( name, way, extra_hc_opts, compile_only, top_mod ): cmd = 'cd ' + getTestOpts().testdir + " && '" \ + config.compiler + "' " \ + join(flags,' ') + ' ' \ - + join(config.way_flags[way],' ') + ' ' \ + + join(config.way_flags(name)[way],' ') + ' ' \ + extra_hc_opts + ' ' \ + getTestOpts().extra_hc_opts \ + to_do \ @@ -1536,7 +1536,7 @@ def extcore_run( name, way, extra_hc_opts, compile_only, top_mod ): deplist2 = string.replace(deplist,'.lhs,', '.hcr'); to_compile = string.replace(deplist2,'.hs,', '.hcr'); - flags = join(filter(lambda f: f != '-fext-core',config.way_flags[way]),' ') + flags = join(filter(lambda f: f != '-fext-core',config.way_flags(name)[way]),' ') if getTestOpts().outputdir != None: flags.extend(["-outputdir", getTestOpts().outputdir]) |