[commit: testsuite] master: Update test to match new I/O manager behavior (38c064d)

Johan Tibell johan.tibell at gmail.com
Tue Feb 12 07:52:58 CET 2013


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/38c064dc3ca59404de379f4a3d0b27ec98f1dd40

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

commit 38c064dc3ca59404de379f4a3d0b27ec98f1dd40
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Fri Feb 8 16:59:16 2013 -0800

    Update test to match new I/O manager behavior
    
    The new I/O manager has a separate thread for tracking timeouts.

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

 tests/rts/T4850.hs     |    7 ++++---
 tests/rts/T4850.stdout |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/rts/T4850.hs b/tests/rts/T4850.hs
index 72616d9..fa06ffb 100644
--- a/tests/rts/T4850.hs
+++ b/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/tests/rts/T4850.stdout b/tests/rts/T4850.stdout
index b8626c4..7ed6ff8 100644
--- a/tests/rts/T4850.stdout
+++ b/tests/rts/T4850.stdout
@@ -1 +1 @@
-4
+5





More information about the ghc-commits mailing list