From 9c0650ba3f0a664800612661de2060f9ee0d213f Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 21 May 2012 20:51:41 +0200 Subject: make all tests executable and exit on error --- TestAufgabeFFP1.hs | 16 ++++++++++++++-- TestAufgabeFFP2.hs | 16 ++++++++++++++-- TestAufgabeFFP3.hs | 19 ++++++++++++++----- TestAufgabeFFP4.hs | 16 ++++++++++++++-- TestAufgabeFFP5.hs | 15 +++++++++++++-- TestAufgabeFFP6.hs | 15 +++++++++++++-- TestAufgabeFFP7.hs | 15 +++++++++++++-- 7 files changed, 95 insertions(+), 17 deletions(-) mode change 100644 => 100755 TestAufgabeFFP1.hs mode change 100644 => 100755 TestAufgabeFFP2.hs mode change 100644 => 100755 TestAufgabeFFP3.hs mode change 100644 => 100755 TestAufgabeFFP4.hs mode change 100644 => 100755 TestAufgabeFFP5.hs mode change 100644 => 100755 TestAufgabeFFP6.hs mode change 100644 => 100755 TestAufgabeFFP7.hs diff --git a/TestAufgabeFFP1.hs b/TestAufgabeFFP1.hs old mode 100644 new mode 100755 index 4a38f3c..d1152f4 --- a/TestAufgabeFFP1.hs +++ b/TestAufgabeFFP1.hs @@ -1,7 +1,11 @@ +#!/usr/bin/runhugs +l + module Main where import Test.HUnit import Control.Monad +import System +import Data.Array import AufgabeFFP1 assertBoolF :: String -> Bool -> Assertion @@ -79,6 +83,14 @@ fibspdTests = TestList [fibspd1] tests :: [Test] tests = [pof2s1, pdTests, fibdiagTests, fibdiagsTests, fibspdTests] +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure + main = do - forM tests $ \test -> - runTestTT test + forM tests $ (\test -> runTest test) diff --git a/TestAufgabeFFP2.hs b/TestAufgabeFFP2.hs old mode 100644 new mode 100755 index 1131e04..6399c45 --- a/TestAufgabeFFP2.hs +++ b/TestAufgabeFFP2.hs @@ -1,7 +1,11 @@ +#!/usr/bin/runhugs +l + module Main where import Test.HUnit import Control.Monad +import System +import Data.Array import AufgabeFFP2 cases1 = TestLabel "pps" $ TestList [ @@ -39,6 +43,14 @@ cases4 = TestLabel "gz/gzs" $ TestList [ tests :: [Test] tests = [cases1, cases2, cases3, cases4] +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure + main = do - forM tests $ \test -> - runTestTT test + forM tests $ (\test -> runTest test) diff --git a/TestAufgabeFFP3.hs b/TestAufgabeFFP3.hs old mode 100644 new mode 100755 index 065401d..30a915e --- a/TestAufgabeFFP3.hs +++ b/TestAufgabeFFP3.hs @@ -1,10 +1,13 @@ +#!/usr/bin/runhugs +l + module Main where import Prelude hiding (filter) - import Test.HUnit import Control.Monad +import System +import Data.Array import AufgabeFFP3 cases1 = TestLabel "foo" $ TestList [ @@ -33,11 +36,17 @@ cases4 = TestLabel "bar" $ TestList [ TestCase $ assertEqual "a" ( [binomS (n, k) | k <- [0..50], n <- [k..50] ] ) ( [binomM (n, k) | k <- [0..50], n <- [k..50] ] ) ] - tests :: [Test] tests = [cases1, cases2, cases3, cases4] -main = do - forM tests $ \test -> - runTestTT test +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure +main = do + forM tests $ (\test -> runTest test) diff --git a/TestAufgabeFFP4.hs b/TestAufgabeFFP4.hs old mode 100644 new mode 100755 index ff341e5..1c20e87 --- a/TestAufgabeFFP4.hs +++ b/TestAufgabeFFP4.hs @@ -1,7 +1,11 @@ +#!/usr/bin/runhugs +l + module Main where import Test.HUnit import Control.Monad +import System +import Data.Array import AufgabeFFP4 ------------------------------------------------------------------------------- @@ -70,6 +74,14 @@ cases2 = TestLabel "binomDyn" $ TestList [ tests :: [Test] tests = [cases1, cases2] +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure + main = do - forM tests $ \test -> - runTestTT test + forM tests $ (\test -> runTest test) diff --git a/TestAufgabeFFP5.hs b/TestAufgabeFFP5.hs old mode 100644 new mode 100755 index 865f503..cbdd05b --- a/TestAufgabeFFP5.hs +++ b/TestAufgabeFFP5.hs @@ -1,7 +1,10 @@ +#!/usr/bin/runhugs +l + module Main where import Test.HUnit import Control.Monad +import System import Data.Array import AufgabeFFP5 @@ -65,6 +68,14 @@ cases4 = TestLabel "minIndex" $ TestList [ tests :: [Test] tests = [cases1, cases2, cases3, cases4] +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure + main = do - forM tests $ \test -> - runTestTT test + forM tests $ (\test -> runTest test) diff --git a/TestAufgabeFFP6.hs b/TestAufgabeFFP6.hs old mode 100644 new mode 100755 index 1f661e6..9849a1a --- a/TestAufgabeFFP6.hs +++ b/TestAufgabeFFP6.hs @@ -1,7 +1,10 @@ +#!/usr/bin/runhugs -X-98 +o +l + module Main where import Test.HUnit import Control.Monad +import System import AufgabeFFP6 import Data.Array @@ -81,6 +84,14 @@ cases4 = TestLabel "yield" $ TestList [ tests :: [Test] tests = [cases1, cases2, cases3, cases4] +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure + main = do - forM tests $ \test -> - runTestTT test + forM tests $ (\test -> runTest test) diff --git a/TestAufgabeFFP7.hs b/TestAufgabeFFP7.hs old mode 100644 new mode 100755 index 116a445..f83952b --- a/TestAufgabeFFP7.hs +++ b/TestAufgabeFFP7.hs @@ -1,7 +1,10 @@ +#!/usr/bin/runhugs +l + module Main where import Test.HUnit import Control.Monad +import System import AufgabeFFP7 import Test.QuickCheck import System.IO.Unsafe @@ -34,6 +37,14 @@ cases2 = TestLabel "ssfn/minfree" $ TestList [ tests :: [Test] tests = [cases2] +isSuccess :: Counts -> Bool +isSuccess Counts{ cases = _, tried = _, errors = 0, failures = 0 } = True +isSuccess Counts{ cases = _, tried = _, errors = _, failures = _ } = False + +runTest :: Test -> IO () +runTest test = do + result <- runTestTT test + unless (isSuccess result) exitFailure + main = do - forM tests $ \test -> - runTestTT test + forM tests $ (\test -> runTest test) -- cgit v1.2.3