[commit: testsuite] master: Update tests following changes in base (6507c1b)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6507c1b07341abc940315e1e753ef76101a0e5c4

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

commit 6507c1b07341abc940315e1e753ef76101a0e5c4
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Jun 20 13:21:11 2012 +0100

    Update tests following changes in base

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

 tests/concurrent/should_run/3279.hs       |    1 -
 tests/concurrent/should_run/conc073.hs    |    1 -
 tests/concurrent/should_run/mask002.hs    |    1 -
 tests/concurrent/should_run/throwto002.hs |    1 -
 tests/concurrent/should_run/throwto003.hs |    1 -
 tests/numeric/should_run/numrun013.hs     |    1 -
 tests/rename/should_fail/T5281.hs         |    6 +++---
 tests/rename/should_fail/T5281.stderr     |    7 +++----
 tests/rename/should_fail/T5281A.hs        |    7 +++++++
 tests/rename/should_fail/all.T            |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/concurrent/should_run/3279.hs b/tests/concurrent/should_run/3279.hs
index 279895f..f479704 100644
--- a/tests/concurrent/should_run/3279.hs
+++ b/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
diff --git a/tests/concurrent/should_run/conc073.hs b/tests/concurrent/should_run/conc073.hs
index 66bbe8e..64d9d99 100644
--- a/tests/concurrent/should_run/conc073.hs
+++ b/tests/concurrent/should_run/conc073.hs
@@ -1,6 +1,5 @@
 import Control.Exception
 import Control.Concurrent
-import Prelude hiding (catch)
 
 main = do
   m1 <- newEmptyMVar
diff --git a/tests/concurrent/should_run/mask002.hs b/tests/concurrent/should_run/mask002.hs
index 15b2e64..264ac1f 100644
--- a/tests/concurrent/should_run/mask002.hs
+++ b/tests/concurrent/should_run/mask002.hs
@@ -1,7 +1,6 @@
 import Control.Exception
 import Control.Concurrent
 import Text.Printf
-import Prelude hiding(catch)
 
 -- Test combinations of nesting mask/uninterruptibleMask with
 -- forkIO/forkIOUnmask
diff --git a/tests/concurrent/should_run/throwto002.hs b/tests/concurrent/should_run/throwto002.hs
index 98c9f1f..db67c24 100644
--- a/tests/concurrent/should_run/throwto002.hs
+++ b/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
diff --git a/tests/concurrent/should_run/throwto003.hs b/tests/concurrent/should_run/throwto003.hs
index 6369c62..7a7582f 100644
--- a/tests/concurrent/should_run/throwto003.hs
+++ b/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
diff --git a/tests/numeric/should_run/numrun013.hs b/tests/numeric/should_run/numrun013.hs
index 93fe56f..8f7966e 100644
--- a/tests/numeric/should_run/numrun013.hs
+++ b/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
diff --git a/tests/rename/should_fail/T5281.hs b/tests/rename/should_fail/T5281.hs
index f83e4ae..837b0ac 100644
--- a/tests/rename/should_fail/T5281.hs
+++ b/tests/rename/should_fail/T5281.hs
@@ -1,8 +1,8 @@
 -- 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
 
 
diff --git a/tests/rename/should_fail/T5281.stderr b/tests/rename/should_fail/T5281.stderr
index c12f4e7..3fa7670 100644
--- a/tests/rename/should_fail/T5281.stderr
+++ b/tests/rename/should_fail/T5281.stderr
@@ -1,5 +1,4 @@
 
-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"
diff --git a/tests/rename/should_fail/T5281A.hs b/tests/rename/should_fail/T5281A.hs
new file mode 100644
index 0000000..34ef9b7
--- /dev/null
+++ b/tests/rename/should_fail/T5281A.hs
@@ -0,0 +1,7 @@
+
+module T5281A where
+
+{-# DEPRECATED deprec "This is deprecated" #-}
+deprec :: Int
+deprec = 5
+
diff --git a/tests/rename/should_fail/all.T b/tests/rename/should_fail/all.T
index bad0d83..168d657 100644
--- a/tests/rename/should_fail/all.T
+++ b/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,