[commit: testsuite] master: mask002: Follow changes in base (2e679d7)

Ian Lynagh igloo at earth.li
Sat Feb 16 18:24:32 CET 2013


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2e679d7d809642da451ad98a1bdf4316dc0eb7d0

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

commit 2e679d7d809642da451ad98a1bdf4316dc0eb7d0
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Feb 16 14:01:13 2013 +0000

    mask002: Follow changes in base

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

 tests/concurrent/should_run/mask002.hs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/concurrent/should_run/mask002.hs b/tests/concurrent/should_run/mask002.hs
index 264ac1f..069af8f 100644
--- a/tests/concurrent/should_run/mask002.hs
+++ b/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 ()





More information about the ghc-commits mailing list