diff options
author | Simon Marlow <marlowsd@gmail.com> | 2013-08-22 20:07:22 +0100 |
---|---|---|
committer | Simon Marlow <marlowsd@gmail.com> | 2013-08-22 20:07:57 +0100 |
commit | 7b03dbf5b950ac1e21ab6035a652c08b188ed1db (patch) | |
tree | 5483ce5e2cce68dba02266d2094b37a4f7eb66f9 /testsuite | |
parent | f3f9077839201555cbf4f8d62bb0550b3ef24af7 (diff) | |
download | haskell-7b03dbf5b950ac1e21ab6035a652c08b188ed1db.tar.gz |
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.
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/tests/rts/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/rts/atomicinc.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 6445f63035..cd71b7f222 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/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/testsuite/tests/rts/atomicinc.c b/testsuite/tests/rts/atomicinc.c index 8f1c8bf3ed..5588413e52 100644 --- a/testsuite/tests/rts/atomicinc.c +++ b/testsuite/tests/rts/atomicinc.c @@ -1,5 +1,3 @@ -#define THREADED_RTS - #include "Rts.h" StgWord i; |