Update tests following changes in base

testsuite/tests/concurrent/should_run/3279.hs

@@ -3,7 +3,6 @@
 import System.IO.Unsafe
 import GHC.Conc
 import Control.Exception
-import Prelude hiding (catch)
 
 f :: Int
 f = (1 +) . unsafePerformIO $ do

testsuite/tests/concurrent/should_run/conc073.hs

 import Control.Exception
 import Control.Concurrent
-import Prelude hiding (catch)
 
 main = do
   m1 <- newEmptyMVar

testsuite/tests/concurrent/should_run/mask002.hs

 import Control.Exception
 import Control.Concurrent
 import Text.Printf
-import Prelude hiding(catch)
 
 -- Test combinations of nesting mask/uninterruptibleMask with
 -- forkIO/forkIOUnmask

testsuite/tests/concurrent/should_run/throwto002.hs

@@ -7,7 +7,6 @@ import System.Environment
 import Control.Monad
 import GHC.Conc
 import Data.IORef
-import Prelude hiding (catch)
 
 main = do
   r <- newIORef 0

testsuite/tests/concurrent/should_run/throwto003.hs

@@ -2,7 +2,6 @@
 import Control.Concurrent
 import Control.Exception
 import Control.Monad
-import Prelude hiding (catch)
 
 main = do
   m <- newMVar 1

testsuite/tests/numeric/should_run/numrun013.hs

@@ -3,7 +3,6 @@
 
 import Control.Exception
 import Data.Int
-import Prelude hiding (catch)
 
 main :: IO ()
 main = do print ((minBound :: Int) `div` (-1))   `myCatch` print

testsuite/tests/rename/should_fail/T5281.hs

 -- The issue here is getting an error message with a decent source location
 module T5281 where
 
-x = catch   -- This use of catch 
-            -- (a) comes from the implicitly imported Prelue
-            -- (b) this Prelude.catch is deprecated
+import T5281A
+
+x = deprec
 
 

testsuite/tests/rename/should_fail/T5281.stderr

 
-T5281.hs:4:5: Warning:
-    In the use of `catch'
-    (imported from Prelude, but defined in System.IO.Error):
-    Deprecated: "Please use the new exceptions variant, Control.Exception.catch"
+T5281.hs:6:5: Warning:
+    In the use of `deprec' (imported from T5281A):
+    Deprecated: "This is deprecated"

testsuite/tests/rename/should_fail/T5281A.hs

+
+module T5281A where
+
+{-# DEPRECATED deprec "This is deprecated" #-}
+deprec :: Int
+deprec = 5
+

testsuite/tests/rename/should_fail/all.T

@@ -82,7 +82,7 @@ test('mc13', normal, compile_fail, [''])
 test('mc14', normal, compile_fail, [''])
 test('T5211', normal, compile, [''])  # Warnings only
 test('T1595a', normal, compile_fail, [''])
-test('T5281', normal, compile, [''])  # Warnings only
+test('T5281', normal, multimod_compile, ['T5281', '-v0'])  # Warnings only
 test('T5372',
      extra_clean(['T5372a.hi', 'T5372a.o']),
      multimod_compile_fail,