[commit: packages/stm] master: stm047 and stm048 seem to work fine with WAY=ghci (ee75600)

git at git.haskell.org git at git.haskell.org
Tue Feb 16 13:44:34 UTC 2016


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

On branch  : master
Link       : http://git.haskell.org/packages/stm.git/commitdiff/ee756000fc654a105ff3f8a319b904f2df33c65b

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

commit ee756000fc654a105ff3f8a319b904f2df33c65b
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Feb 16 13:10:02 2016 +0100

    stm047 and stm048 seem to work fine with WAY=ghci
    
    Also delete compiler_lt.


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

ee756000fc654a105ff3f8a319b904f2df33c65b
 tests/all.T | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/tests/all.T b/tests/all.T
index 92b641d..26000af 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,14 +1,6 @@
 test('stm046', [], compile_and_run, [''])
-
-# Omit GHCi for these two, since they appear to deadlock (23/11/2004 --SDM)
-test('stm047',
-     [omit_ways(['ghci']),
-      when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2']))],
-     compile_and_run, [''])
-test('stm048',
-     [omit_ways(['ghci']),
-      when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2']))],
-     compile_and_run, [''])
+test('stm047', [], compile_and_run, [''])
+test('stm048', [], compile_and_run, [''])
 
 # The above tests don't require 'stm', but the ones below do.
 setTestOpts(reqlib('stm'))
@@ -16,11 +8,7 @@ setTestOpts(reqlib('stm'))
 test('stm049', [reqlib('random')], compile_and_run, ['-package stm'])
 test('stm050', [extra_run_opts('10000')], compile_and_run, ['-package stm'])
 
-# Was failing prof ways due to #1547, but now apparently succeeds:
-test('stm052', [ reqlib('random'),
-                 when(compiler_lt('ghc', '6.9'),
-                      expect_broken_for(1547,['profc','profasm'])) ],
-     compile_and_run, ['-package stm'])
+test('stm052', [reqlib('random')], compile_and_run, ['-package stm'])
 
 test('stm053', [ reqlib('random'),
                  only_ways(['threaded1','threaded2']),



More information about the ghc-commits mailing list