diff options
author | Péter Diviánszky <divipp@gmail.com> | 2016-05-01 22:56:42 +0200 |
---|---|---|
committer | Péter Diviánszky <divipp@gmail.com> | 2016-05-01 22:56:42 +0200 |
commit | 128cf82881352cc1e9061db97fe3762315cfd0c9 (patch) | |
tree | 60f0efc4d587a58359b39edba470fd55a0d8c69a /test/runTests.hs | |
parent | e2ef3e4de33e15627ce21c7c506650b2f8123a1c (diff) |
removing coloring from .out files
Diffstat (limited to 'test/runTests.hs')
-rw-r--r-- | test/runTests.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/runTests.hs b/test/runTests.hs index c2c201f1..4b2d71fb 100644 --- a/test/runTests.hs +++ b/test/runTests.hs | |||
@@ -204,10 +204,10 @@ doTest Config{..} (i, fn) = do | |||
204 | Right (fname, x@Right{}) -> Right (fname, x) <$ removeFromCache fname | 204 | Right (fname, x@Right{}) -> Right (fname, x) <$ removeFromCache fname |
205 | 205 | ||
206 | f ((i, desug), e) | not $ isReject fn = case e of | 206 | f ((i, desug), e) | not $ isReject fn = case e of |
207 | Left (show -> e) -> Left (unlines $ tab "!Failed" e: listTraceInfos i, Failed) | 207 | Left (show -> e) -> Left (unlines $ tab "!Failed" e: map show (listTraceInfos i), Failed) |
208 | Right (fname, Left (show -> e)) | 208 | Right (fname, Left (pShow -> e)) |
209 | -> Right ("typechecked module" | 209 | -> Right ("typechecked module" |
210 | , unlines $ "------------ desugared source code": map ppShow desug ++ | 210 | , simpleShow $ vcat $ "------------ desugared source code": map pShow desug ++ |
211 | e: listAllInfos i) | 211 | e: listAllInfos i) |
212 | Right (fname, Right (e, te)) | 212 | Right (fname, Right (e, te)) |
213 | | te == outputType -> Right ("compiled pipeline", prettyShowUnlines $ compilePipeline OpenGL33 (e, te)) | 213 | | te == outputType -> Right ("compiled pipeline", prettyShowUnlines $ compilePipeline OpenGL33 (e, te)) |
@@ -215,7 +215,7 @@ doTest Config{..} (i, fn) = do | |||
215 | | te == boolType -> Left (tab "!Failed" $ "main should be True but it is \n" ++ ppShow e, Failed) | 215 | | te == boolType -> Left (tab "!Failed" $ "main should be True but it is \n" ++ ppShow e, Failed) |
216 | | otherwise -> Right ("reduced main " ++ ppShow te, ppShow e) | 216 | | otherwise -> Right ("reduced main " ++ ppShow te, ppShow e) |
217 | | otherwise = case e of | 217 | | otherwise = case e of |
218 | Left (show -> e) -> Right ("error message", unlines $ e: listAllInfos i) | 218 | Left (pShow -> e) -> Right ("error message", simpleShow $ vcat $ e: listAllInfos i) |
219 | Right _ -> Left (tab "!Failed" "failed to catch error", Failed) | 219 | Right _ -> Left (tab "!Failed" "failed to catch error", Failed) |
220 | 220 | ||
221 | tab msg | 221 | tab msg |