[commit: testsuite] master: Fix atomicinc (dca02c2)

git at git.haskell.org git at git.haskell.org
Thu Aug 22 21:08:10 CEST 2013


Repository : ssh://git@git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dca02c23e0e2d9778dda581d6be9eeb4462befba/testsuite

>---------------------------------------------------------------

commit dca02c23e0e2d9778dda581d6be9eeb4462befba
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu Aug 22 20:07:22 2013 +0100

    Fix atomicinc
    
    I think the change in optimisation levels due to
    d06083739a310c36e9e6dc82107c8c4b03210e56 had the side effect of not
    inlining atomic_inc(), which together with the broken way the test was
    set up made it fail.


>---------------------------------------------------------------

dca02c23e0e2d9778dda581d6be9eeb4462befba
 tests/rts/all.T       |    2 +-
 tests/rts/atomicinc.c |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/rts/all.T b/tests/rts/all.T
index 6445f63..cd71b7f 100644
--- a/tests/rts/all.T
+++ b/tests/rts/all.T
@@ -63,7 +63,7 @@ test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
                    extra_run_opts('500000 +RTS -kc1k -kb100 -K96m -RTS') ],
                  compile_and_run, [''])
 
-test('atomicinc', [ c_src, only_ways(['normal']) ], compile_and_run, [''])
+test('atomicinc', [ c_src, only_ways(['normal','threaded1', 'threaded2']) ], compile_and_run, [''])
 
 test('T3424', # it's slow:
               [ when(fast(), skip), only_ways(['normal','threaded1','ghci']) ],
diff --git a/tests/rts/atomicinc.c b/tests/rts/atomicinc.c
index 8f1c8bf..5588413 100644
--- a/tests/rts/atomicinc.c
+++ b/tests/rts/atomicinc.c
@@ -1,5 +1,3 @@
-#define THREADED_RTS
-
 #include "Rts.h"
 
 StgWord i;





More information about the ghc-commits mailing list