[commit: testsuite] master: conc031 now deadlocks, due to fix for #7970 (4b9cbcd)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

https://github.com/ghc/testsuite/commit/4b9cbcdb73b52dd38d6edb369580f22d51c63380

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

commit 4b9cbcdb73b52dd38d6edb369580f22d51c63380
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Jul 2 11:53:08 2013 +0100

    conc031 now deadlocks, due to fix for #7970
    
    We decided that fixing #7970 is more important.

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

 tests/concurrent/should_run/all.T          |    2 +-
 tests/concurrent/should_run/conc031.stderr |    1 +
 tests/concurrent/should_run/conc031.stdout |    2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/concurrent/should_run/all.T b/tests/concurrent/should_run/all.T
index 8a32c10..e10a107 100644
--- a/tests/concurrent/should_run/all.T
+++ b/tests/concurrent/should_run/all.T
@@ -141,7 +141,7 @@ test('conc030',
      [only_compiler_types(['ghc']), extra_run_opts('+RTS -K4M -RTS')],
 		compile_and_run, [''])
 
-test('conc031', normal, compile_and_run, [''])
+test('conc031', exit_code(1), compile_and_run, [''])
 
 test('conc032', only_compiler_types(['ghc']), compile_and_run, [''])
 test('conc033', normal, compile_and_run, [''])
diff --git a/tests/concurrent/should_run/conc031.stderr b/tests/concurrent/should_run/conc031.stderr
new file mode 100644
index 0000000..7a2319d
--- /dev/null
+++ b/tests/concurrent/should_run/conc031.stderr
@@ -0,0 +1 @@
+conc031: thread blocked indefinitely in an MVar operation
diff --git a/tests/concurrent/should_run/conc031.stdout b/tests/concurrent/should_run/conc031.stdout
index 8d45abf..e69de29 100644
--- a/tests/concurrent/should_run/conc031.stdout
+++ b/tests/concurrent/should_run/conc031.stdout
@@ -1,2 +0,0 @@
-True
-End.