summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-16 14:01:13 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-16 14:01:13 +0000
commit721f9cce8ee3cfbf002e8f39261509509aa53712 (patch)
treef815a05b6afb0ec8e8a47e4313c69ca6bfb57657
parentcfa86dbf460afbcdb9bad2ee18c0c3708b85d71c (diff)
downloadhaskell-721f9cce8ee3cfbf002e8f39261509509aa53712.tar.gz
mask002: Follow changes in base
-rw-r--r--testsuite/tests/concurrent/should_run/mask002.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/tests/concurrent/should_run/mask002.hs b/testsuite/tests/concurrent/should_run/mask002.hs
index 264ac1fb70..069af8f2fc 100644
--- a/testsuite/tests/concurrent/should_run/mask002.hs
+++ b/testsuite/tests/concurrent/should_run/mask002.hs
@@ -3,7 +3,7 @@ import Control.Concurrent
import Text.Printf
-- Test combinations of nesting mask/uninterruptibleMask with
--- forkIO/forkIOUnmask
+-- forkIO/forkIOWithUnmask
main = do
m <- newEmptyMVar
@@ -17,9 +17,11 @@ main = do
print (e::SomeException)
throwIO e
killThread t2
- t3 <- mask_ $ forkIOUnmasked $ do stat 3 Unmasked; putMVar m ()
+ t3 <- mask_ $ forkIOWithUnmask $ \unmask ->
+ unmask $ do stat 3 Unmasked; putMVar m ()
takeMVar m
- t4 <- uninterruptibleMask_ $ forkIOUnmasked $ do stat 4 Unmasked; putMVar m ()
+ t4 <- uninterruptibleMask_ $ forkIOWithUnmask $ \unmask ->
+ unmask $ do stat 4 Unmasked; putMVar m ()
takeMVar m
stat :: Int -> MaskingState -> IO ()