Convert the test to a test-suite. (#110)

This works with `stack` and `cabal new-test`.  The latter
uses the `build-tool-depends` field to locate the binary.

Also:
- Remove the reference to the nonexistent main file on Windows.
- Make the test binary return a nonzero exit code when it fails.

Still TODO: test in CI.

Author: judah

haskeline.cabal

@@ -112,17 +112,17 @@ Library
 
     ghc-options: -Wall
 
-Executable haskeline-tests
+test-suite haskeline-tests
+    type: exitcode-stdio-1.0
     hs-source-dirs: tests
     Default-Language: Haskell98
 
     if os(windows)
-        Main-is: NotExisting.hs
         buildable: False
-    else
-        Main-Is:    Unit.hs
-        Build-depends: base, containers, text, bytestring, HUnit, process, unix
-        Other-Modules: RunTTY, Pty
+    Main-Is:    Unit.hs
+    Build-depends: base, containers, text, bytestring, HUnit, process, unix
+    Other-Modules: RunTTY, Pty
+    build-tool-depends: haskeline:haskeline-examples-Test
 
 -- The following program is used by unit tests in `tests` executable
 Executable haskeline-examples-Test

tests/RunTTY.hs

@@ -11,12 +11,12 @@ module RunTTY (Invocation(..),
             setUTF8
             ) where
 
-import Data.ByteString as B
-import qualified Data.ByteString.Char8 as BC
-import System.Process
 import Control.Concurrent
+import Data.ByteString as B
 import System.IO
+import System.Process
 import Test.HUnit
+import qualified Data.ByteString.Char8 as BC
 
 import Pty
 

tests/Unit.hs

@@ -1,27 +1,24 @@
 {-# LANGUAGE OverloadedStrings #-}
--- Usage:
---   ghc ../examples/Test.hs
---   ghc Unit.hs
---   ./Unit ../examples/Test
 -- Requirements:
 -- - Empty ~/.haskeline (or set to defaults)
--- - Assumes the dummy folder is in the current folder
--- - On Mac OS X, may need to clear out /usr/lib/charset.alias
---   (In particular, the line "* UTF-8" which makes locale_charset()
---   always return UTF-8; otherwise we can't test latin-1.)
+-- - On Mac OS X, the "dumb term" test may fail.
+--   In particular, the line "* UTF-8" which makes locale_charset()
+--   always return UTF-8; otherwise we can't test latin-1.
 -- - NB: Window size isn't provided by screen so it's picked up from
 --   terminfo or defaults (either way: 80x24), rather than the user's
 --   terminal.
 module Main where
 
-import System.Environment
-import Test.HUnit
+import Control.Monad (when)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC
 import Data.Word
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Monoid ((<>))
+import System.Exit (exitFailure)
+import System.Process (readProcess)
+import Test.HUnit
 
 import RunTTY
 
@@ -37,18 +34,19 @@ legacyEncoding = False
 whenLegacy :: BC.ByteString -> BC.ByteString
 whenLegacy s = if legacyEncoding then s else B.empty
 
-main :: IO Counts
+main :: IO ()
 main = do
-    [p] <- getArgs
+    -- forkProcess needs an absolute path to the binary.
+    p <- head . lines <$> readProcess "which" ["haskeline-examples-Test"] ""
     let i = setTerm "xterm"
             Invocation {
                 prog = p,
                 progArgs = [],
                 runInTTY = True,
                 environment = []
             }
-    runTestTT $ test [interactionTests i, fileStyleTests i]
-
+    result <- runTestTT $ test [interactionTests i, fileStyleTests i]
+    when (errors result > 0 || failures result > 0) exitFailure
 
 interactionTests :: Invocation -> Test
 interactionTests i = "interaction" ~: test
@@ -113,10 +111,10 @@ unicodeMovement i = "Unicode movement" ~:
 
 tabCompletion :: Invocation -> Test
 tabCompletion i = "tab completion" ~:
-    [ utf8Test i [ utf8 "dummy-μ\t\t" ]
-        [ prompt 0, utf8 "dummy-μασ/"
-            <> nl <> utf8 "bar   ςερτ" <> nl
-            <> prompt' 0 <> utf8 "dummy-μασ/"
+    [ utf8Test i [ utf8 "tests/dummy-μ\t\t" ]
+        [ prompt 0, utf8 "tests/dummy-μασ/"
+            <> nl <> utf8 "ςερτ  bar" <> nl
+            <> prompt' 0 <> utf8 "tests/dummy-μασ/"
         ]
     ]