@@ -45,8 +45,11 @@ unittest: runghc hledger.hs test # run doc tests -doctest: - tools/doctest.hs Tests.hs +doctest: tools/doctest + tools/doctest Tests.hs + +tools/doctest: tools/doctest.hs + ghc --make tools/doctest.hs # build profiling-enabled hledgerp and archive and show a cleaned-up profile # you may need to rebuild some libs: sudo cabal install --reinstall -p ... Makefile @@ -39,13 +39,13 @@ main = do f <- head `fmap` getArgs s <- readFile f let tests = doctests s - putStrLn $ printf "running %d doctests from %s" (length tests) f + putStrLn $ printf "Running %d doctests from %s" (length tests) f mapM_ runShellDocTest $ doctests s runShellDocTest :: String -> IO Bool runShellDocTest s = do let (cmd, expected) = splitDocTest s - putStr $ printf "testing: %s .. " cmd + putStr $ printf "Testing: %s .. " cmd (_, out, _, h) <- runInteractiveCommand cmd exit <- waitForProcess h output <- hGetContents out @@ -56,7 +56,7 @@ runShellDocTest s = do putStrLn "ok" return True else do - putStr $ printf "FAILED\nexpected:\n%sgot:\n%s" expected output + putStr $ printf "FAILED\nExpected:\n%sGot:\n%s" expected output return False else do putStrLn $ printf "ERROR: %s" (show exit) tools/doctest.hs c5b96b6bc520b4847243857e598b77470f3246db Simon Michael simon@joyful.com http://github.com/jwiegley/hledger/commit/6db536e2bf463b8e205a6f2322935705e7b6c0bb 6db536e2bf463b8e205a6f2322935705e7b6c0bb 2009-03-15T01:47:23-07:00 2009-03-15T01:47:23-07:00 tweak doctest output, and compile it 20090315084723-3c3f9-58181688fc0a74c2203729c263f9671c26787369.gz c1b51d2333722cc4559490dc9efe218f76a09fd7 Simon Michael simon@joyful.com