[commit: testsuite] master: Adapt to removal of catch from Prelude (dda6e3a)

[Simon Marlow]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/dda6e3aeb618f6d048b83d2512bcf62e8fc97d64

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

commit dda6e3aeb618f6d048b83d2512bcf62e8fc97d64
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Jul 9 13:22:41 2012 +0100

    Adapt to removal of catch from Prelude

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

 tests/concurrent/should_run/conc024.hs             |    3 +++
 tests/concurrent/should_run/conc029.hs             |    3 +++
 tests/concurrent/should_run/conc030.hs             |    3 +++
 tests/concurrent/should_run/conc034.hs             |    3 +++
 .../concurrent/should_run/foreignInterruptible.hs  |    5 +++--
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/concurrent/should_run/conc024.hs b/tests/concurrent/should_run/conc024.hs
index e37d64a..c141082 100644
--- a/tests/concurrent/should_run/conc024.hs
+++ b/tests/concurrent/should_run/conc024.hs
@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP #-}
 module Main where
 
 import Control.Exception
 import Control.Concurrent
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 import System.Mem
 
 -- illustrates the BlockOnDeadMVar exception
diff --git a/tests/concurrent/should_run/conc029.hs b/tests/concurrent/should_run/conc029.hs
index dc11500..ceca99d 100644
--- a/tests/concurrent/should_run/conc029.hs
+++ b/tests/concurrent/should_run/conc029.hs
@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP #-}
 module Main where
 
 import Control.Exception
 import Control.Concurrent
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 
 -- the BlockOnDeadMVar exception doesn't cause any output by default
 
diff --git a/tests/concurrent/should_run/conc030.hs b/tests/concurrent/should_run/conc030.hs
index 4f01668..658feb3 100644
--- a/tests/concurrent/should_run/conc030.hs
+++ b/tests/concurrent/should_run/conc030.hs
@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP #-}
 module Main where
 
 import Control.Exception
 import Control.Concurrent
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 
 -- the ThreadKilled exception doesn't cause any output by default
 
diff --git a/tests/concurrent/should_run/conc034.hs b/tests/concurrent/should_run/conc034.hs
index 4101212..993b961 100644
--- a/tests/concurrent/should_run/conc034.hs
+++ b/tests/concurrent/should_run/conc034.hs
@@ -1,10 +1,13 @@
+{-# LANGUAGE CPP #-}
 import Control.Concurrent
 import Control.Exception
 import Foreign
 
 import System.IO (hFlush,stdout)
 
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 
 -- !!! Try to get two threads into a knot depending on each other.
 
diff --git a/tests/concurrent/should_run/foreignInterruptible.hs b/tests/concurrent/should_run/foreignInterruptible.hs
index ca59fbd..52da549 100644
--- a/tests/concurrent/should_run/foreignInterruptible.hs
+++ b/tests/concurrent/should_run/foreignInterruptible.hs
@@ -1,10 +1,11 @@
-{-# LANGUAGE ForeignFunctionInterface,InterruptibleFFI #-}
-{-# OPTIONS -cpp #-}
+{-# LANGUAGE CPP,ForeignFunctionInterface,InterruptibleFFI #-}
 module Main where
 
 import Control.Concurrent
 import Control.Exception
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 import Foreign
 import System.IO