Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c921302b775a568dfc28b7f9881fadb8d6a6a57f >--------------------------------------------------------------- commit c921302b775a568dfc28b7f9881fadb8d6a6a57f Author: Simon Marlow <[email protected]> Date: Tue Nov 29 09:09:25 2011 +0000 defined prof_ways, threaded_ways and opt_ways automatically These are handy for using in only_ways() and expect_broken_for() >--------------------------------------------------------------- config/ghc | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/config/ghc b/config/ghc index 671c8a8..e030e7f 100644 --- a/config/ghc +++ b/config/ghc @@ -65,27 +65,27 @@ config.clean_only = clean_only config.way_flags = { 'normal' : [], 'g1' : [], - 'optasm' : ['-O -fasm'], + 'optasm' : ['-O', '-fasm'], 'llvm' : ['-fllvm'], - 'optllvm' : ['-O -fllvm'], - 'debugllvm' : ['-fllvm -keep-llvm-files'], - 'prof' : ['-prof -auto-all -fasm'], - 'profasm' : ['-O -prof -auto-all'], - 'profthreaded' : ['-O -prof -auto-all -threaded'], + 'optllvm' : ['-O', '-fllvm'], + 'debugllvm' : ['-fllvm' '-keep-llvm-files'], + 'prof' : ['-prof', '-auto-all', '-fasm'], + 'profasm' : ['-O', '-prof', '-auto-all'], + 'profthreaded' : ['-O', '-prof', '-auto-all', '-threaded'], 'ghci' : ['--interactive', '-v0', '-ignore-dot-ghci', '+RTS', '-I0.1', '-RTS'], 'extcore' : ['-fext-core'], - 'optextcore' : ['-O -fext-core'], + 'optextcore' : ['-O', '-fext-core'], 'threaded1' : ['-threaded', '-debug'], 'threaded1_ls' : ['-threaded', '-debug'], 'threaded2' : ['-O', '-threaded', '-eventlog'], 'threaded2_hT' : ['-O', '-threaded'], 'hpc' : ['-O', '-fhpc' ], - 'prof_hc_hb' : ['-O -prof -auto-all'], - 'prof_hb' : ['-O -prof -auto-all'], - 'prof_hd' : ['-O -prof -auto-all'], - 'prof_hy' : ['-O -prof -auto-all'], - 'prof_hr' : ['-O -prof -auto-all'], - 'dyn' : ['-O -dynamic'] + 'prof_hc_hb' : ['-O', '-prof', '-auto-all'], + 'prof_hb' : ['-O', '-prof', '-auto-all'], + 'prof_hd' : ['-O', '-prof', '-auto-all'], + 'prof_hy' : ['-O', '-prof', '-auto-all'], + 'prof_hr' : ['-O', '-prof', '-auto-all'], + 'dyn' : ['-O', '-dynamic'] } config.way_rts_flags = { @@ -114,13 +114,20 @@ config.way_rts_flags = { 'dyn' : [] } -# Useful classes of ways: +# Useful classes of ways that can be used with only_ways() and +# expect_broken_for(). -prof_ways = filter(lambda x: x in config.run_ways, - ['prof', 'profasm','profthreaded']) +prof_ways = map (lambda x: x[0], \ + filter(lambda x: '-prof' in x[1], \ + config.way_flags.items())) -threaded_ways = filter(lambda x: x in config.run_ways, - ['threaded1','threaded2','ghci','profthreaded']) +threaded_ways = map (lambda x: x[0], \ + filter(lambda x: '-threaded' in x[1], \ + config.way_flags.items())) + +opt_ways = map (lambda x: x[0], \ + filter(lambda x: '-O' in x[1], \ + config.way_flags.items())) def get_compiler_info(): # This should really not go through the shell _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
