Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a9b6a46293ba51b2200f77e8788045bc71703106 >--------------------------------------------------------------- commit a9b6a46293ba51b2200f77e8788045bc71703106 Author: Simon Marlow <marlo...@gmail.com> Date: Wed May 11 11:09:30 2011 +0100 - remove threaded2_qw way, the -qw flag has been a no-op for a while - add the threaded2_hT way, for testing +RTS -N -hT (#5127) - enable threaded2_hT for concprog002, to test for #5127 >--------------------------------------------------------------- config/ghc | 10 +++++----- tests/ghc-regress/concurrent/prog002/all.T | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/ghc b/config/ghc index 36dfac1..693b125 100644 --- a/config/ghc +++ b/config/ghc @@ -26,7 +26,7 @@ config.other_ways = ['extcore','optextcore', 'prof_hc_hb','prof_hb', 'prof_hd','prof_hy','prof_hr', 'threaded1_ls', - 'threaded2_qw', + 'threaded2_hT', 'llvm', 'optllvm'] if (ghc_with_native_codegen == 1): @@ -74,8 +74,8 @@ config.way_flags = { 'threaded1' : ['-threaded', '-debug'], 'threaded1_ls' : ['-threaded', '-debug'], 'threaded2' : ['-O', '-threaded', '-eventlog'], - 'threaded2_qw' : ['-O', '-threaded'], - 'hpc' : ['-O', '-fhpc' ], + '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'], @@ -97,8 +97,8 @@ config.way_rts_flags = { 'threaded1' : [], 'threaded1_ls' : ['-ls'], 'threaded2' : ['-N2 -ls'], - 'threaded2_qw' : ['-N2', '-qw'], - 'hpc' : [], + 'threaded2_hT' : ['-N2', '-hT'], + 'hpc' : [], 'prof_hc_hb' : ['-hc -hbvoid'], 'prof_hb' : ['-hb'], 'prof_hd' : ['-hd'], diff --git a/tests/ghc-regress/concurrent/prog002/all.T b/tests/ghc-regress/concurrent/prog002/all.T index 625206d..f87bc8b 100644 --- a/tests/ghc-regress/concurrent/prog002/all.T +++ b/tests/ghc-regress/concurrent/prog002/all.T @@ -4,7 +4,9 @@ # hence -O0: test('concprog002', - [only_ways(['threaded2','threaded2_qw']), + # Add 'threaded2_hT' so that we have at least one test for bug #5127 + [only_ways(['threaded2','threaded2_hT']), + extra_ways(['threaded2_hT']), exit_code(1), skip_if_fast, extra_clean(['Event.hi', 'Event.o', _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc