Commit cd0a88aa authored by Ian Lynagh's avatar Ian Lynagh

Update tests following changes in base

parent de246aad
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
import System.IO.Unsafe import System.IO.Unsafe
import GHC.Conc import GHC.Conc
import Control.Exception import Control.Exception
import Prelude hiding (catch)
f :: Int f :: Int
f = (1 +) . unsafePerformIO $ do f = (1 +) . unsafePerformIO $ do
......
import Control.Exception import Control.Exception
import Control.Concurrent import Control.Concurrent
import Prelude hiding (catch)
main = do main = do
m1 <- newEmptyMVar m1 <- newEmptyMVar
......
import Control.Exception import Control.Exception
import Control.Concurrent import Control.Concurrent
import Text.Printf import Text.Printf
import Prelude hiding(catch)
-- Test combinations of nesting mask/uninterruptibleMask with -- Test combinations of nesting mask/uninterruptibleMask with
-- forkIO/forkIOUnmask -- forkIO/forkIOUnmask
......
...@@ -7,7 +7,6 @@ import System.Environment ...@@ -7,7 +7,6 @@ import System.Environment
import Control.Monad import Control.Monad
import GHC.Conc import GHC.Conc
import Data.IORef import Data.IORef
import Prelude hiding (catch)
main = do main = do
r <- newIORef 0 r <- newIORef 0
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import Control.Concurrent import Control.Concurrent
import Control.Exception import Control.Exception
import Control.Monad import Control.Monad
import Prelude hiding (catch)
main = do main = do
m <- newMVar 1 m <- newMVar 1
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
import Control.Exception import Control.Exception
import Data.Int import Data.Int
import Prelude hiding (catch)
main :: IO () main :: IO ()
main = do print ((minBound :: Int) `div` (-1)) `myCatch` print main = do print ((minBound :: Int) `div` (-1)) `myCatch` print
......
-- The issue here is getting an error message with a decent source location -- The issue here is getting an error message with a decent source location
module T5281 where module T5281 where
x = catch -- This use of catch import T5281A
-- (a) comes from the implicitly imported Prelue
-- (b) this Prelude.catch is deprecated x = deprec
T5281.hs:4:5: Warning: T5281.hs:6:5: Warning:
In the use of `catch' In the use of `deprec' (imported from T5281A):
(imported from Prelude, but defined in System.IO.Error): Deprecated: "This is deprecated"
Deprecated: "Please use the new exceptions variant, Control.Exception.catch"
module T5281A where
{-# DEPRECATED deprec "This is deprecated" #-}
deprec :: Int
deprec = 5
...@@ -82,7 +82,7 @@ test('mc13', normal, compile_fail, ['']) ...@@ -82,7 +82,7 @@ test('mc13', normal, compile_fail, [''])
test('mc14', normal, compile_fail, ['']) test('mc14', normal, compile_fail, [''])
test('T5211', normal, compile, ['']) # Warnings only test('T5211', normal, compile, ['']) # Warnings only
test('T1595a', normal, compile_fail, ['']) test('T1595a', normal, compile_fail, [''])
test('T5281', normal, compile, ['']) # Warnings only test('T5281', normal, multimod_compile, ['T5281', '-v0']) # Warnings only
test('T5372', test('T5372',
extra_clean(['T5372a.hi', 'T5372a.o']), extra_clean(['T5372a.hi', 'T5372a.o']),
multimod_compile_fail, multimod_compile_fail,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment