Skip conc047(threaded2) in the 6.8 branch
authorIan Lynagh <igloo@earth.li>
Fri, 30 May 2008 20:42:40 +0000 (20:42 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 30 May 2008 20:42:40 +0000 (20:42 +0000)
It sometimes seems to deadlock after printing
Before
Survived unused retry
Caught: thread blocked indefinitely
(i.e. in the final part of the test). 6.8.2 does it too, so this isn't
a regression in 6.8.3.

tests/all.T

index ce934e2..080e26b 100644 (file)
@@ -1,8 +1,11 @@
 test('conc046', only_compiler_types(['ghc']), compile_and_run, [''])
 
 # Omit GHCi for these two, since they appear to deadlock (23/11/2004 --SDM)
-test('conc047', compose(only_compiler_types(['ghc']), 
-                        omit_ways(['ghci'])), compile_and_run, [''])
+test('conc047',
+     composes([only_compiler_types(['ghc']), 
+               omit_ways(['ghci']),
+               if_compiler_lt('ghc', '6.9', omit_ways(['ghci', 'threaded2']))]),
+     compile_and_run, [''])
 test('conc048', compose(only_compiler_types(['ghc']), 
                         omit_ways(['ghci'])), compile_and_run, [''])