diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-02 20:06:35 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-02 20:06:35 +0000 |
| commit | 3b9c6514a50e453e74f9fba6dea1b2a7a5dcfab0 (patch) | |
| tree | a6165c8c8edcfc3274f8c536b07eeff87450393d /testsuite/tests/concurrent/should_run | |
| parent | 48ba35e032dc85f2f38d7d7c3c41cffdac1dce5d (diff) | |
| parent | 05b18ad0a57528f4fcf0e9608a03a9b180060710 (diff) | |
| download | haskell-3b9c6514a50e453e74f9fba6dea1b2a7a5dcfab0.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org//testsuite
Conflicts:
mk/boilerplate.mk
Diffstat (limited to 'testsuite/tests/concurrent/should_run')
| -rw-r--r-- | testsuite/tests/concurrent/should_run/5866.hs | 10 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/should_run/5866.stderr | 1 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/testsuite/tests/concurrent/should_run/5866.hs b/testsuite/tests/concurrent/should_run/5866.hs new file mode 100644 index 0000000000..4650ea66e9 --- /dev/null +++ b/testsuite/tests/concurrent/should_run/5866.hs @@ -0,0 +1,10 @@ +import GHC.Conc +import Control.Exception +import System.IO.Unsafe +import System.Timeout + +main :: IO () +main = do + x <- unsafeInterleaveIO $ atomically retry + _ <- timeout 500000 $ evaluate x + evaluate x diff --git a/testsuite/tests/concurrent/should_run/5866.stderr b/testsuite/tests/concurrent/should_run/5866.stderr new file mode 100644 index 0000000000..a4774f25ab --- /dev/null +++ b/testsuite/tests/concurrent/should_run/5866.stderr @@ -0,0 +1 @@ +5866: thread blocked indefinitely in an STM transaction diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 5c5a914022..375dc6ff1e 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -68,6 +68,7 @@ test('5558', test('5421', normal, compile_and_run, ['']) test('5611', normal, compile_and_run, ['']) test('5238', normal, compile_and_run, ['']) +test('5866', exit_code(1), compile_and_run, ['']) # ----------------------------------------------------------------------------- # These tests we only do for a full run |