[project @ 2001-05-03 12:30:35 by simonpj]

[ghc-hetmet.git] / ghc / tests / concurrent / should_run / conc015.hs

diff --git a/ghc/tests/concurrent/should_run/conc015.hs b/ghc/tests/concurrent/should_run/conc015.hs
index ad4fc69..07b2fcd 100644 (file)
--- a/ghc/tests/concurrent/should_run/conc015.hs
+++ b/ghc/tests/concurrent/should_run/conc015.hs
@@ -15,18 +15,18 @@ main = do
   m <- newEmptyMVar
   m2 <- newEmptyMVar
   forkIO (do takeMVar m
-            raiseInThread main_thread (ErrorCall "foo")
-            raiseInThread main_thread (ErrorCall "bar") 
+            throwTo main_thread (ErrorCall "foo")
+            throwTo main_thread (ErrorCall "bar") 
             putMVar m2 ()
         )
   ( do
-    blockAsyncExceptions (do
+    block (do
        putMVar m ()
-       threadDelay 500000
-       (unblockAsyncExceptions (threadDelay 500000))
-               `catchAllIO` (\e -> putStrLn ("caught1: " ++ show e))
+       sum [1..10000] `seq` -- give 'foo' a chance to be raised
+         (unblock (threadDelay 500000))
+               `Exception.catch` (\e -> putStrLn ("caught1: " ++ show e))
      )
     takeMVar m2
    )
-    `catchAllIO`
+    `Exception.catch`
     (\e -> putStrLn ("caught2: " ++ show e))