From fa6f0e8d1a90e42414a28b289d80c0af8c01e753 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 18 Aug 2018 14:36:02 +0100
Subject: [PATCH] cli: make cabal test suite run the test command, not just
 hunit tests

---
 hledger/Hledger/Cli/Commands.hs |  1 +
 hledger/test/test.hs            | 17 ++++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/hledger/Hledger/Cli/Commands.hs b/hledger/Hledger/Cli/Commands.hs
index bef6ccbdd..b967945e6 100644
--- a/hledger/Hledger/Cli/Commands.hs
+++ b/hledger/Hledger/Cli/Commands.hs
@@ -8,6 +8,7 @@ hledger's built-in commands, and helpers for printing the commands list.
 
 module Hledger.Cli.Commands (
    findCommand
+  ,testcmd
   ,builtinCommands
   ,builtinCommandNames
   ,printCommandsList
diff --git a/hledger/test/test.hs b/hledger/test/test.hs
index 01c9b6e8d..24da64dee 100644
--- a/hledger/test/test.hs
+++ b/hledger/test/test.hs
@@ -1,13 +1,8 @@
-import Hledger.Cli (tests_Hledger_Cli)
-import System.Environment (getArgs)
-import Test.Framework.Providers.HUnit (hUnitTestToTests)
-import Test.Framework.Runners.Console (defaultMainWithArgs)
-
-main :: IO ()
-main = do
-  args <- getArgs
-  let args' = "--hide-successes" : args
-  defaultMainWithArgs (hUnitTestToTests tests_Hledger_Cli) args'
-
+{-
+Run hledger's (and hledger-lib's) unit tests as a cabal test suite,
+by running the test command with no options.
+-}
 
+import Hledger.Cli
 
+main = testcmd defcliopts (error "journal-less command tried to use the journal")