on master help sign in
try having travis CI use cabal-install 1.20 for test compat
commit4391f6212b8f7d54566a6035756bfec2c9f2ac01 authorCorey O'Connor <coreyoconnor@gmail.com> dateThu 14 Aug 2014, 17:37 (12 years ago) parentb667656
2 files changed+19−19
test/interactive_terminal_test.hs+18−18 test/vty-examples.cabal+1−1
test/interactive_terminal_test.hs+18−18
@@ -78,7 +78,7 @@ with the test_results.list file pasted into the issue. A suitable summary is:
7878 ( \ (_ :: SomeException) -> return (envName, "") )
7979 )
8080 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
81− t <- outputForCurrentTerminal def
81+ t <- standardIOConfig >>= outputForConfig
8282 let resultsTxt = show envAttributes ++ "\n"
8383 ++ terminalID t ++ "\n"
8484 ++ show results ++ "\n"
@@ -189,7 +189,7 @@ reserveOutputTest = Test
189189 { testName = "Initialize and reserve terminal output then restore previous state."
190190 , testID = "reserveOutputTest"
191191 , testAction = do
192− t <- outputForCurrentTerminal def
192+ t <- standardIOConfig >>= outputForConfig
193193 reserveDisplay t
194194 putStrLn "Line 1"
195195 putStrLn "Line 2"
@@ -222,7 +222,7 @@ displayBoundsTest0 = Test
222222 { testName = "Verify display bounds are correct test 0: Using spaces."
223223 , testID = "displayBoundsTest0"
224224 , testAction = do
225− t <- outputForCurrentTerminal def
225+ t <- standardIOConfig >>= outputForConfig
226226 reserveDisplay t
227227 (w,h) <- displayBounds t
228228 let row0 = replicate (fromEnum w) 'X' ++ "\n"
@@ -243,7 +243,7 @@ displayBoundsTest1 = Test
243243 { testName = "Verify display bounds are correct test 0: Using cursor movement."
244244 , testID = "displayBoundsTest1"
245245 , testAction = do
246− t <- outputForCurrentTerminal def
246+ t <- standardIOConfig >>= outputForConfig
247247 reserveDisplay t
248248 (w,h) <- displayBounds t
249249 setCursorPos t 0 0
@@ -272,7 +272,7 @@ displayBoundsTest2 = Test
272272 { testName = "Verify display bounds are correct test 0: Using Image ops."
273273 , testID = "displayBoundsTest2"
274274 , testAction = do
275− t <- outputForCurrentTerminal def
275+ t <- standardIOConfig >>= outputForConfig
276276 reserveDisplay t
277277 bounds@(w,h) <- displayBounds t
278278 let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
@@ -295,7 +295,7 @@ displayBoundsTest3 = Test
295295 { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
296296 , testID = "displayBoundsTest3"
297297 , testAction = do
298− t <- outputForCurrentTerminal def
298+ t <- standardIOConfig >>= outputForConfig
299299 reserveDisplay t
300300 (w,h) <- displayBounds t
301301 hideCursor t
@@ -407,7 +407,7 @@ unicodeSingleWidth0 = Test
407407 { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
408408 , testID = "unicodeSingleWidth0"
409409 , testAction = do
410− t <- outputForCurrentTerminal def
410+ t <- standardIOConfig >>= outputForConfig
411411 reserveDisplay t
412412 hideCursor t
413413 withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
@@ -426,7 +426,7 @@ unicodeSingleWidth1 = Test
426426 { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
427427 , testID = "unicodeSingleWidth1"
428428 , testAction = do
429− t <- outputForCurrentTerminal def
429+ t <- standardIOConfig >>= outputForConfig
430430 reserveDisplay t
431431 let pic = picForImage image
432432 image = line0 <-> line1
@@ -489,7 +489,7 @@ unicodeDoubleWidth0 = Test
489489 { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
490490 , testID = "unicodeDoubleWidth0"
491491 , testAction = do
492− t <- outputForCurrentTerminal def
492+ t <- standardIOConfig >>= outputForConfig
493493 reserveDisplay t
494494 hideCursor t
495495 withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
@@ -508,7 +508,7 @@ unicodeDoubleWidth1 = Test
508508 { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
509509 , testID = "unicodeDoubleWidth1"
510510 , testAction = do
511− t <- outputForCurrentTerminal def
511+ t <- standardIOConfig >>= outputForConfig
512512 reserveDisplay t
513513 let pic = picForImage image
514514 image = line0 <-> line1
@@ -562,7 +562,7 @@ attributesTest0 = Test
562562 { testName = "Character attributes: foreground colors."
563563 , testID = "attributesTest0"
564564 , testAction = do
565− t <- outputForCurrentTerminal def
565+ t <- standardIOConfig >>= outputForConfig
566566 reserveDisplay t
567567 let pic = picForImage image
568568 image = border <|> column0 <|> border <|> column1 <|> border
@@ -608,7 +608,7 @@ attributesTest1 = Test
608608 { testName = "Character attributes: background colors."
609609 , testID = "attributesTest1"
610610 , testAction = do
611− t <- outputForCurrentTerminal def
611+ t <- standardIOConfig >>= outputForConfig
612612 reserveDisplay t
613613 let pic = picForImage image
614614 image = border <|> column0 <|> border <|> column1 <|> border
@@ -663,7 +663,7 @@ attributesTest2 = Test
663663 { testName = "Character attributes: Vivid foreground colors."
664664 , testID = "attributesTest2"
665665 , testAction = do
666− t <- outputForCurrentTerminal def
666+ t <- standardIOConfig >>= outputForConfig
667667 reserveDisplay t
668668 let pic = picForImage image
669669 image = horizCat [border, column0, border, column1, border, column2, border]
@@ -722,7 +722,7 @@ attributesTest3 = Test
722722 { testName = "Character attributes: Vivid background colors."
723723 , testID = "attributesTest3"
724724 , testAction = do
725− t <- outputForCurrentTerminal def
725+ t <- standardIOConfig >>= outputForConfig
726726 reserveDisplay t
727727 let pic = picForImage image
728728 image = horizCat [border, column0, border, column1, border, column2, border]
@@ -800,7 +800,7 @@ attributesTest4 = Test
800800 { testName = "Character attributes: Bold; Blink; Underline."
801801 , testID = "attributesTest4"
802802 , testAction = do
803− t <- outputForCurrentTerminal def
803+ t <- standardIOConfig >>= outputForConfig
804804 reserveDisplay t
805805 let pic = picForImage image
806806 image = horizCat [border, column0, border, column1, border]
@@ -852,7 +852,7 @@ attributesTest5 = Test
852852 { testName = "Character attributes: 240 color palette"
853853 , testID = "attributesTest5"
854854 , testAction = do
855− t <- outputForCurrentTerminal def
855+ t <- standardIOConfig >>= outputForConfig
856856 reserveDisplay t
857857 let pic = picForImage image
858858 image = vertCat $ map horizCat $ splitColorImages colorImages
@@ -963,7 +963,7 @@ outputImageAndWait image = do
963963
964964outputPicAndWait :: Picture -> IO ()
965965outputPicAndWait pic = do
966− t <- outputForCurrentTerminal def
966+ t <- standardIOConfig >>= outputForConfig
967967 reserveDisplay t
968968 d <- displayBounds t >>= displayContext t
969969 outputPicture d pic
@@ -1146,7 +1146,7 @@ layer1 = Test
11461146
11471147cheesyAnim0 :: Image -> [Image] -> IO ()
11481148cheesyAnim0 i background = do
1149− t <- outputForCurrentTerminal def
1149+ t <- standardIOConfig >>= outputForConfig
11501150 reserveDisplay t
11511151 bounds <- displayBounds t
11521152 d <- displayContext t bounds
test/vty-examples.cabal+1−1
@@ -1,5 +1,5 @@
11name: vty-examples
2−version: 5.0.1
2+version: 5.2.0
33license: BSD3
44license-file: ../LICENSE
55author: AUTHORS