From 1cbe6c95b261a1ae1f527e40fdd2bf11e7e17bd9 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@softwarefreedom.org>
Date: Wed, 15 May 2013 15:47:28 -0400
Subject: [PATCH 1/2] Add cabal testsuite for hledger-lib.

---
 hledger-lib/hledger-lib.cabal | 32 ++++++++++++++++++++++++++++++--
 hledger-lib/tests/suite.hs    |  6 ++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 hledger-lib/tests/suite.hs

diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index 50ff6c8ac..03d5ffdbf 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -18,12 +18,12 @@ homepage:       http://hledger.org
 bug-reports:    http://hledger.org/bugs
 stability:      beta
 tested-with:    GHC==7.2.2, GHC==7.4.2, GHC==7.6.1
-cabal-version:  >= 1.8
+cabal-version:  >= 1.10
 build-type:     Simple
 -- data-dir:       data
 -- data-files:
 -- extra-tmp-files:
--- extra-source-files:
+extra-source-files: tests/suite.hs
 --   README
 --   sample.ledger
 --   sample.timelog
@@ -75,11 +75,39 @@ library
                  ,transformers >= 0.2 && < 0.4
                  ,utf8-string >= 0.3.5 && < 0.4
                  ,HUnit
+  default-language: Haskell2010
 
 source-repository head
   type:     git
   location: https://github.com/simonmichael/hledger
 
+test-suite tests
+  type:     exitcode-stdio-1.0
+  main-is:  tests/suite.hs
+  ghc-options: -Wall
+  build-depends: hledger-lib
+               , base >= 4.3 && < 5
+               , cmdargs
+               , containers
+               , csv
+               , directory
+               , filepath
+               , HUnit
+               , mtl
+               , old-locale
+               , old-time
+               , parsec
+               , pretty-show
+               , regex-compat
+               , regexpr
+               , safe
+               , split
+               , test-framework
+               , test-framework-hunit
+               , time
+               , transformers
+  default-language: Haskell2010
+
 -- cf http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html
 
 -- Additional dependencies:
diff --git a/hledger-lib/tests/suite.hs b/hledger-lib/tests/suite.hs
new file mode 100644
index 000000000..f09f5e2aa
--- /dev/null
+++ b/hledger-lib/tests/suite.hs
@@ -0,0 +1,6 @@
+import Hledger (tests_Hledger)
+import Test.Framework.Providers.HUnit (hUnitTestToTests)
+import Test.Framework.Runners.Console (defaultMain)
+
+main :: IO ()
+main = defaultMain $ hUnitTestToTests tests_Hledger

From 180521996a11e701f0b3592cba8070c03cabd8be Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@softwarefreedom.org>
Date: Wed, 15 May 2013 15:55:49 -0400
Subject: [PATCH 2/2] Add cabal testsuite for hledger.

---
 hledger/hledger.cabal  | 38 ++++++++++++++++++++++++++++++++++++--
 hledger/tests/suite.hs |  6 ++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 hledger/tests/suite.hs

diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index cb6374832..6273a6944 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -19,12 +19,12 @@ homepage:       http://hledger.org
 bug-reports:    http://hledger.org/bugs
 stability:      beta
 tested-with:    GHC==7.2.2, GHC==7.4.2, GHC==7.6.1
-cabal-version:  >= 1.8
+cabal-version:  >= 1.10
 build-type:     Simple
 -- data-dir:       data
 -- data-files:
 extra-tmp-files:
-extra-source-files:
+extra-source-files: tests/suite.hs
 
 -- Cabal-Version:  >= 1.9.2
 -- Test-Suite test-hledger
@@ -83,6 +83,7 @@ library
                  ,text == 0.11.*
                  ,time
                  ,utf8-string >= 0.3.5 && < 0.4
+  default-language: Haskell2010
 
 -- should depend on the above to avoid double compilation but this is
 -- still too complicated as of 2011/6/1 because:
@@ -136,3 +137,36 @@ executable hledger
                  ,text == 0.11.*
                  ,time
                  ,utf8-string >= 0.3.5 && < 0.4
+  default-language: Haskell2010
+
+test-suite tests
+  type:     exitcode-stdio-1.0
+  main-is:  tests/suite.hs
+  ghc-options: -Wall
+  build-depends: hledger-lib
+               , hledger
+               , base >= 4.3 && < 5
+               , cmdargs
+               , containers
+               , csv
+               , directory
+               , filepath
+               , haskeline
+               , HUnit
+               , mtl
+               , old-locale
+               , old-time
+               , parsec
+               , pretty-show
+               , process
+               , regex-compat
+               , regexpr
+               , safe
+               , shakespeare-text
+               , split
+               , test-framework
+               , test-framework-hunit
+               , text
+               , time
+               , transformers
+  default-language: Haskell2010
diff --git a/hledger/tests/suite.hs b/hledger/tests/suite.hs
new file mode 100644
index 000000000..515366b34
--- /dev/null
+++ b/hledger/tests/suite.hs
@@ -0,0 +1,6 @@
+import Hledger.Cli (tests_Hledger_Cli)
+import Test.Framework.Providers.HUnit (hUnitTestToTests)
+import Test.Framework.Runners.Console (defaultMain)
+
+main :: IO ()
+main = defaultMain $ hUnitTestToTests tests_Hledger_Cli