diff options
| author | Johan Tibell <johan.tibell@gmail.com> | 2013-02-08 16:59:16 -0800 |
|---|---|---|
| committer | Johan Tibell <johan.tibell@gmail.com> | 2013-02-11 22:52:40 -0800 |
| commit | dc30d9834829a5e68abef5ee9b8b628f68f0b871 (patch) | |
| tree | 1aa16310a6ce2fcf9ff1aaca98b0ea9873dcffea /testsuite/tests/rts | |
| parent | 675067683ad9039fdc5bad77fcb8fd54c9c0b8e4 (diff) | |
| download | haskell-dc30d9834829a5e68abef5ee9b8b628f68f0b871.tar.gz | |
Update test to match new I/O manager behavior
The new I/O manager has a separate thread for tracking timeouts.
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/T4850.hs | 7 | ||||
| -rw-r--r-- | testsuite/tests/rts/T4850.stdout | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/testsuite/tests/rts/T4850.hs b/testsuite/tests/rts/T4850.hs index 72616d97eb..fa06ffbea2 100644 --- a/testsuite/tests/rts/T4850.hs +++ b/testsuite/tests/rts/T4850.hs @@ -10,11 +10,12 @@ foreign import ccall "wrapper" mkF :: Fun -> IO (FunPtr Fun) foreign import ccall "dynamic" callF :: FunPtr Fun -> Fun --- This test should create 4 OS threads only: +-- This test should create 5 OS threads only: -- one for main -- worker 1 for the IO manager --- worker 2 to run the first forkIO --- worker 3 created when worker 2 makes its foreign call +-- worker 1 for the timeout manager +-- worker 3 to run the first forkIO +-- worker 4 created when worker 2 makes its foreign call -- Due to #4850, an extra worker was being created because worker 2 was -- lost after returning from its foreign call. diff --git a/testsuite/tests/rts/T4850.stdout b/testsuite/tests/rts/T4850.stdout index b8626c4cff..7ed6ff82de 100644 --- a/testsuite/tests/rts/T4850.stdout +++ b/testsuite/tests/rts/T4850.stdout @@ -1 +1 @@ -4 +5 |