diff --git a/Hledger/Cli/Options.hs b/Hledger/Cli/Options.hs index 3d0295ae0..d3aa752b8 100644 --- a/Hledger/Cli/Options.hs +++ b/Hledger/Cli/Options.hs @@ -87,7 +87,7 @@ options = [ #endif ,Option "h" ["help"] (NoArg Help) "show this help" ,Option "V" ["version"] (NoArg Version) "show version information" - ,Option "v" ["verbose"] (NoArg Verbose) "show verbose test output" + ,Option "v" ["verbose"] (NoArg Verbose) "show more verbose output" ,Option "" ["binary-filename"] (NoArg BinaryFilename) "show the download filename for this hledger build" ,Option "" ["debug"] (NoArg Debug) "show extra debug output; implies verbose" ,Option "" ["debug-vty"] (NoArg DebugVty) "run vty command with no vty output, showing console" diff --git a/Hledger/Cli/Tests.hs b/Hledger/Cli/Tests.hs index 64feae94a..9e7836cc8 100644 --- a/Hledger/Cli/Tests.hs +++ b/Hledger/Cli/Tests.hs @@ -29,7 +29,6 @@ $ hledger -f sample.ledger balance o module Hledger.Cli.Tests where import qualified Data.Map as Map -import Test.HUnit.Tools (runVerboseTests) import System.Exit (exitFailure, exitWith, ExitCode(ExitSuccess)) -- base 3 compatible import System.Time (ClockTime(TOD)) @@ -45,13 +44,11 @@ import Hledger.Cli.Utils -- | Run unit tests. runtests :: [Opt] -> [String] -> IO () runtests _ args = do - (counts,_) <- runner ts + (counts,_) <- liftM (flip (,) 0) $ runTestTT ts if errors counts > 0 || (failures counts > 0) then exitFailure else exitWith ExitSuccess where - runner | Verbose `elem` opts = runVerboseTests - | otherwise = liftM (flip (,) 0) . runTestTT ts = TestList $ filter matchname $ tflatten tests -- show flat test names -- ts = tfilter matchname $ TestList tests -- show hierarchical test names matchname = matchpats args . tname diff --git a/MANUAL.markdown b/MANUAL.markdown index 48d82d1ed..687ae6557 100644 --- a/MANUAL.markdown +++ b/MANUAL.markdown @@ -233,7 +233,7 @@ Here is the command-line help: --port web: serve on tcp port N (default 5000) -h --help show this help -V --version show version information - -v --verbose show verbose test output + -v --verbose show more verbose output --binary-filename show the download filename for this hledger build --debug show extra debug output; implies verbose --debug-vty run vty command with no vty output, showing console diff --git a/hledger.cabal b/hledger.cabal index 7d1e4544f..d5f9e9774 100644 --- a/hledger.cabal +++ b/hledger.cabal @@ -84,7 +84,6 @@ executable hledger ,process ,regexpr >= 0.5.1 ,safe >= 0.2 - ,testpack >= 1 && < 2 ,time ,utf8-string >= 0.3 @@ -162,7 +161,6 @@ library ,process ,regexpr >= 0.5.1 ,safe >= 0.2 - ,testpack >= 1 && < 2 ,time ,utf8-string >= 0.3