@@ -0,0 +1,21 @@
1+diff -ru orig/unit-tests/run-unit-tests.hs new/unit-tests/run-unit-tests.hs
2+--- orig/unit-tests/run-unit-tests.hs 2014-03-19 13:49:32.661896632 +0200
3++++ new/unit-tests/run-unit-tests.hs 2014-03-19 13:49:32.000000000 +0200
4+@@ -191,7 +191,7 @@
5+ test_catch :: TestCase
6+ test_catch = TestCase "catch" [] $ do
7+ setImports ["Prelude"]
8+- succeeds (action `catch` handler) @@? "catch failed"
9++ succeeds (action `MC.catch` handler) @@? "catch failed"
10+ where handler DivideByZero = return "catched"
11+ handler e = throwM e
12+ action = do s <- eval "1 `div` 0 :: Int"
13+@@ -203,7 +203,7 @@
14+ liftIO $ do
15+ r <- newEmptyMVar
16+ let concurrent = runInterpreter (liftIO $ putMVar r False)
17+- `catch` \MultipleInstancesNotAllowed ->
18++ `MC.catch` \MultipleInstancesNotAllowed ->
19+ do liftIO $ putMVar r True
20+ return $ Right ()
21+ _ <- forkIO $ concurrent >> return ()