suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified the test harness so that it gives a meta tag on failure (in case we want it)

Browse Source
This commit is contained in:
Neil Brown 2009-02-10 21:33:53 +00:00
parent e37fa37c79
commit 24fa36ccda
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/TestHarness.hs
View File

@ -51,6 +51,7 @@ import System.IO
import Test.HUnit hiding (performTest) import Test.HUnit hiding (performTest)
import CompState import CompState
import Metadata
import ParseOccam import ParseOccam
import ParseRain import ParseRain
import Pass import Pass
@ -74,20 +75,20 @@ defaultState fr v = emptyState {csVerboseLevel = v, csFrontend = fr}
-- | Tests if compiling the given source gives any errors. -- | Tests if compiling the given source gives any errors.
-- If there are errors, they are returned. Upon success, Nothing is returned -- If there are errors, they are returned. Upon success, Nothing is returned
testOccam :: Int -> String -> IO (Maybe String) testOccam :: Int -> String -> IO (Maybe (Maybe Meta, String))
testOccam v source = do (result,_) <- runPassM (defaultState FrontendOccam v) compilation testOccam v source = do (result,_) <- runPassM (defaultState FrontendOccam v) compilation
return $ case result of return $ case result of
Left (_,err) -> Just err Left err -> Just err
Right _ -> Nothing Right _ -> Nothing
where where
compilation = preprocessOccamSource source compilation = preprocessOccamSource source
>>= parseOccamProgram >>= parseOccamProgram
>>= runPasses (getPassList $ defaultState FrontendOccam v) >>= runPasses (getPassList $ defaultState FrontendOccam v)
testRain :: Int -> String -> IO (Maybe String) testRain :: Int -> String -> IO (Maybe (Maybe Meta, String))
testRain v source = do (result,_) <- runPassM (defaultState FrontendRain v) compilation testRain v source = do (result,_) <- runPassM (defaultState FrontendRain v) compilation
return $ case result of return $ case result of
Left (_,err) -> Just err Left err -> Just err
Right _ -> Nothing Right _ -> Nothing
where where
compilation = parseRainProgram "<test>" source compilation = parseRainProgram "<test>" source
@ -127,7 +128,7 @@ performTest fr v fileName fileContents
= TestCase $ = TestCase $
do result <- (if fr == FrontendOccam then testOccam else testRain) v testText do result <- (if fr == FrontendOccam then testOccam else testRain) v testText
case result of case result of
Just err -> if expPass then assertFailure (testName ++ " failed with error: " ++ err) else return () Just err -> if expPass then assertFailure (testName ++ " failed with error: " ++ show err) else return ()
Nothing -> if expPass then return () else assertFailure (testName ++ " expected to fail but passed") Nothing -> if expPass then return () else assertFailure (testName ++ " expected to fail but passed")
-- | Splits a file's contents into the prologue, and subsequent testcases -- | Splits a file's contents into the prologue, and subsequent testcases