aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAdam Vogt <vogt.adam@gmail.com>2010-01-18 19:15:32 +0100
committerAdam Vogt <vogt.adam@gmail.com>2010-01-18 19:15:32 +0100
commit660e5d4eb38ae58acb5e91e40124738df812b8b7 (patch)
tree8d7c700573e36195b7c9f0a265a1c0bda9310e65 /tests
parent1ce181eccefc47f35ef926f5d010d2c8ac678eaa (diff)
downloadxmonad-660e5d4eb38ae58acb5e91e40124738df812b8b7.tar.gz
xmonad-660e5d4eb38ae58acb5e91e40124738df812b8b7.tar.xz
xmonad-660e5d4eb38ae58acb5e91e40124738df812b8b7.zip
Correct warnings with ghc-6.12
Ignore-this: a48ed095b72aedec9eeb88781ace66dc Changes include: - compatibility with base-4 or 3 (base-2 untested) by using extensible-exceptions. This adds an additional dependency for users of ghc<6.10) - list all dependencies again when -ftesting (change in Cabal-1.8.0.2) - remove unnecessary imports - suppress -fwarn-unused-do-bind, with appropriate Cabal-1.8 workaround, described here: http://www.haskell.org/pipermail/xmonad/2010-January/009554.html darcs-hash:20100118181532-1499c-5c496678ef76f2f50b43b0fc4582cfef7c237654.gz
Diffstat (limited to 'tests')
-rw-r--r--tests/Properties.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/Properties.hs b/tests/Properties.hs
index 8a8ab04..ae3f2e7 100644
--- a/tests/Properties.hs
+++ b/tests/Properties.hs
@@ -14,7 +14,7 @@ import Data.Ratio
import Data.Maybe
import System.Environment
import Control.Exception (assert)
-import qualified Control.Exception as C
+import qualified Control.Exception.Extensible as C
import Control.Monad
import Test.QuickCheck hiding (promote)
import System.IO.Unsafe
@@ -613,13 +613,13 @@ prop_lookup_visible (x :: T) =
-- and help out hpc
prop_abort x = unsafePerformIO $ C.catch (abort "fail")
- (\e -> return $ show e == "xmonad: StackSet: fail" )
+ (\(C.SomeException e) -> return $ show e == "xmonad: StackSet: fail" )
where
_ = x :: Int
-- new should fail with an abort
prop_new_abort x = unsafePerformIO $ C.catch f
- (\e -> return $ show e == "xmonad: StackSet: non-positive argument to StackSet.new" )
+ (\(C.SomeException e) -> return $ show e == "xmonad: StackSet: non-positive argument to StackSet.new" )
where
f = new undefined{-layout-} [] [] `seq` return False