[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

John Goerzen jgoerzen at complete.org
Fri Apr 23 15:24:56 UTC 2010


The following commit has been merged in the master branch:
commit c4966a78e48b56c9d2e354f361712bbf2a7ba7dc
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Jan 27 15:47:47 2009 -0600

    GHC 6.10 compat

diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
index 59d2de6..8011925 100644
--- a/src/Test/HUnit/Tools.hs
+++ b/src/Test/HUnit/Tools.hs
@@ -25,7 +25,12 @@ import System.IO
 import Text.Printf
 
 {- | Asserts that a specific exception is raised by a given action. -}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 610
+assertRaises :: (Show a, Control.Exception.Exception e, Show e, Eq e) =>
+                String -> e -> IO a -> IO ()
+#else
 assertRaises :: Show a => String -> Control.Exception.Exception -> IO a -> IO ()
+#endif
 assertRaises msg selector action =
     let thetest e = if e == selector then return ()
                     else assertFailure $ msg ++ "\nReceived unexpected exception: "
diff --git a/testpack.cabal b/testpack.cabal
index 40f45f1..fb03c10 100644
--- a/testpack.cabal
+++ b/testpack.cabal
@@ -30,7 +30,7 @@ Library
   Test.QuickCheck.Tools,
   Test.QuickCheck.Instances
 
- Extensions: ExistentialQuantification
+ Extensions: ExistentialQuantification, CPP
 
  Build-Depends: base,
                haskell98, mtl, HUnit, 

-- 
haskell-testpack



More information about the Pkg-haskell-commits mailing list