diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2011-12-24 21:07:35 +0100 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2011-12-24 21:07:35 +0100 |
commit | 301a336bdc1b43e3ce637da51653042fe670eef7 (patch) | |
tree | 358244acdeef2d29b22a39bb85968a5215c26aba | |
parent | a4f38eb196209436f72b938f6355f6e28474bef3 (diff) |
Use a cabal test-suite section instead of the deprecated runTests hook
-rw-r--r-- | Setup.lhs | 5 | ||||
-rw-r--r-- | hmatrix.cabal | 15 |
2 files changed, 15 insertions, 5 deletions
@@ -8,13 +8,10 @@ | |||
8 | > import System.Process(system) | 8 | > import System.Process(system) |
9 | > import Config(config) | 9 | > import Config(config) |
10 | 10 | ||
11 | > main = defaultMainWithHooks simpleUserHooks { confHook = c, runTests = t } | 11 | > main = defaultMainWithHooks simpleUserHooks { confHook = c } |
12 | 12 | ||
13 | > c x y = do | 13 | > c x y = do |
14 | > binfo <- confHook simpleUserHooks x y | 14 | > binfo <- confHook simpleUserHooks x y |
15 | > pbi <- config binfo | 15 | > pbi <- config binfo |
16 | > let pkg_descr = localPkgDescr binfo | 16 | > let pkg_descr = localPkgDescr binfo |
17 | > return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr } | 17 | > return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr } |
18 | |||
19 | > t _ _ _ _ = system ( "runhaskell examples/tests.hs") >> return() | ||
20 | |||
diff --git a/hmatrix.cabal b/hmatrix.cabal index bfe875d..63da6fb 100644 --- a/hmatrix.cabal +++ b/hmatrix.cabal | |||
@@ -23,7 +23,7 @@ Description: Purely functional interface to basic linear algebra | |||
23 | Category: Math | 23 | Category: Math |
24 | tested-with: GHC ==6.10.4, GHC ==6.12.1, GHC ==6.12.3, GHC ==7.0.1, GHC==7.0.2, GHC==7.2.1 | 24 | tested-with: GHC ==6.10.4, GHC ==6.12.1, GHC ==6.12.3, GHC ==7.0.1, GHC==7.0.2, GHC==7.2.1 |
25 | 25 | ||
26 | cabal-version: >=1.6 | 26 | cabal-version: >=1.8 |
27 | 27 | ||
28 | build-type: Custom | 28 | build-type: Custom |
29 | 29 | ||
@@ -224,3 +224,16 @@ source-repository head | |||
224 | -- type: exitcode-stdio-1.0 | 224 | -- type: exitcode-stdio-1.0 |
225 | -- main-is: examples/tests.hs | 225 | -- main-is: examples/tests.hs |
226 | 226 | ||
227 | test-suite test-hmatrix | ||
228 | type: exitcode-stdio-1.0 | ||
229 | main-is: tests.hs | ||
230 | build-depends: hmatrix | ||
231 | , base | ||
232 | , QuickCheck | ||
233 | , storable-complex | ||
234 | , array | ||
235 | , process | ||
236 | , HUnit | ||
237 | , random | ||
238 | hs-source-dirs: lib, examples | ||
239 | Extensions: ForeignFunctionInterface, CPP | ||