test suite configured for hmatrix-tests

4 files changed, 15 insertions, 7 deletions

diff --git a/Setup.lhs b/Setup.lhs
index ba435f0..6f71194 100644
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -8,7 +8,7 @@
 > import System.Process(system)
 > import Config(config)
 
-> main = defaultMainWithHooks simpleUserHooks { confHook = c, runTests = t }
+> main = defaultMainWithHooks simpleUserHooks { confHook = c }
 
 > c x y = do
 >     binfo <- confHook simpleUserHooks x y
@@ -16,5 +16,4 @@
 >     let pkg_descr = localPkgDescr binfo
 >     return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr }
 
-> t _ _ _ _ = system ( "runhaskell examples/tests.hs") >> return()
 
diff --git a/packages/tests/Setup.lhs b/packages/tests/Setup.lhs
index 6b32049..4b19c19 100644
--- a/packages/tests/Setup.lhs
+++ b/packages/tests/Setup.lhs
@@ -2,3 +2,4 @@
 
 > import Distribution.Simple
 > main = defaultMain
+
diff --git a/packages/tests/hmatrix-tests.cabal b/packages/tests/hmatrix-tests.cabal
index cd32a4e..9f7bcdc 100644
--- a/packages/tests/hmatrix-tests.cabal
+++ b/packages/tests/hmatrix-tests.cabal
@@ -11,7 +11,7 @@ Description:        Tests for hmatrix
 Category:           Math
 tested-with:        GHC==7.0.4
 
-cabal-version:      >=1.6
+cabal-version:      >=1.8
 
 build-type:         Simple
 
@@ -38,7 +38,8 @@ source-repository head
     type:     git
     location: https://github.com/AlbertoRuiz/hmatrix
 
-Test-Suite tests
+Test-Suite basic
+    Build-Depends: base, hmatrix-tests
     type: exitcode-stdio-1.0
     main-is: src/tests.hs
 
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index 69ef1b3..8d402d0 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -36,16 +36,22 @@ import Numeric.GSL
 import Prelude hiding ((^))
 import qualified Prelude
 import System.CPUTime
+import System.Exit
 import Text.Printf
 import Data.Packed.Development(unsafeFromForeignPtr,unsafeToForeignPtr)
 import Control.Arrow((***))
 import Debug.Trace
+import Control.Monad(when)
 
 import Test.QuickCheck(Arbitrary,arbitrary,coarbitrary,choose,vector
                       ,sized,classify,Testable,Property
-                      ,quickCheckWith,maxSize,stdArgs,shrink)
+                      ,quickCheckWithResult,maxSize,stdArgs,shrink)
 
-qCheck n = quickCheckWith stdArgs {maxSize = n}
+import Test.QuickCheck.Test(isSuccess)
+
+qCheck n x = do
+    r <- quickCheckWithResult stdArgs {maxSize = n} x
+    when (not $ isSuccess r) (exitFailure)
 
 a ^ b = a Prelude.^ (b :: Int)
 
@@ -546,7 +552,7 @@ runTests n = do
     test (\m -> toRows (m::FM) == read (show (toRows m)))
     test (\m -> toRows (m::ZM) == read (show (toRows m)))
     putStrLn "------ some unit tests"
-    _ <- runTestTT $ TestList
+    c <- runTestTT $ TestList
         [ utest "1E5 rots" rotTest
         , utest "det1" detTest1
         , utest "invlndet" detTest2
@@ -586,6 +592,7 @@ runTests n = do
         , conformTest
         , accumTest
         ]
+    when (errors c + failures c > 0) exitFailure
     return ()