diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2013-07-02 11:53:08 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2013-07-02 11:53:08 +0100 |
| commit | e010fa602ead213323e84ddd9a379f8d3b1ad0d1 (patch) | |
| tree | 1c7ff79ea3551a6da2ea6248abf7fb3696a6aae6 | |
| parent | 40e10bd0634670e9ebf9609c1713fb07aeee8077 (diff) | |
| download | haskell-e010fa602ead213323e84ddd9a379f8d3b1ad0d1.tar.gz | |
conc031 now deadlocks, due to fix for #7970
We decided that fixing #7970 is more important.
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/should_run/conc031.stderr | 1 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/should_run/conc031.stdout | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 8a32c10cf8..e10a107d9e 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/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/testsuite/tests/concurrent/should_run/conc031.stderr b/testsuite/tests/concurrent/should_run/conc031.stderr new file mode 100644 index 0000000000..7a2319de4d --- /dev/null +++ b/testsuite/tests/concurrent/should_run/conc031.stderr @@ -0,0 +1 @@ +conc031: thread blocked indefinitely in an MVar operation diff --git a/testsuite/tests/concurrent/should_run/conc031.stdout b/testsuite/tests/concurrent/should_run/conc031.stdout index 8d45abf2c7..e69de29bb2 100644 --- a/testsuite/tests/concurrent/should_run/conc031.stdout +++ b/testsuite/tests/concurrent/should_run/conc031.stdout @@ -1,2 +0,0 @@ -True -End. |