From f82ed83153655cc57f1b6059e1755c308c40245c Mon Sep 17 00:00:00 2001 From: Mykola Orliuk Date: Sat, 16 Nov 2019 15:02:00 +0100 Subject: [PATCH] ;lib: re-enable easytests --- hledger-lib/hledger-lib.cabal | 54 ++--------------------------------- hledger-lib/package.yaml | 6 ++-- hledger-lib/test/easytests.hs | 5 +++- 3 files changed, 8 insertions(+), 57 deletions(-) diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index afccb54ad..c53b3dd18 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: d8bff513572239ec58023f9d69f207434d3ce06db8866c7d6469bbdb26daa47d +-- hash: 4b32c89e49ba64c66ca8552bb3ac2d54099cff23f9950b7fe294a32297a9b01a name: hledger-lib version: 1.15.99 @@ -208,56 +208,6 @@ test-suite doctests test-suite easytests type: exitcode-stdio-1.0 main-is: easytests.hs - other-modules: - Hledger - Hledger.Data - Hledger.Data.Account - Hledger.Data.AccountName - Hledger.Data.Amount - Hledger.Data.Commodity - Hledger.Data.Dates - Hledger.Data.Journal - Hledger.Data.Ledger - Hledger.Data.Period - Hledger.Data.PeriodicTransaction - Hledger.Data.Posting - Hledger.Data.RawOptions - Hledger.Data.StringFormat - Hledger.Data.Timeclock - Hledger.Data.Transaction - Hledger.Data.TransactionModifier - Hledger.Data.Types - Hledger.Data.Valuation - Hledger.Query - Hledger.Read - Hledger.Read.Common - Hledger.Read.CsvReader - Hledger.Read.JournalReader - Hledger.Read.TimeclockReader - Hledger.Read.TimedotReader - Hledger.Reports - Hledger.Reports.AccountTransactionsReport - Hledger.Reports.BalanceReport - Hledger.Reports.BudgetReport - Hledger.Reports.EntriesReport - Hledger.Reports.MultiBalanceReport - Hledger.Reports.PostingsReport - Hledger.Reports.ReportOptions - Hledger.Reports.ReportTypes - Hledger.Reports.TransactionsReport - Hledger.Utils - Hledger.Utils.Color - Hledger.Utils.Debug - Hledger.Utils.Parse - Hledger.Utils.Regex - Hledger.Utils.String - Hledger.Utils.Test - Hledger.Utils.Text - Hledger.Utils.Tree - Hledger.Utils.UTF8IOCompat - Text.Megaparsec.Custom - Text.Tabular.AsciiWide - Paths_hledger_lib hs-source-dirs: ./. test @@ -304,7 +254,7 @@ test-suite easytests , transformers >=0.2 , uglymemo , utf8-string >=0.3.5 - buildable: False + buildable: True if (!impl(ghc >= 8.0)) build-depends: semigroups ==0.18.* diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index b7a0e7d3d..922e1f3a6 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -156,9 +156,6 @@ library: tests: - # 201909: disabled easytests by default. It require a slow rebuild - # of hledger-lib and are not worth the time, energy and carbon. - doctests: buildable: true source-dirs: test @@ -190,8 +187,9 @@ tests: easytests: - buildable: false + buildable: true source-dirs: test main: easytests.hs + other-modules: [] # https://github.com/sol/hpack/issues/188 dependencies: - hledger-lib diff --git a/hledger-lib/test/easytests.hs b/hledger-lib/test/easytests.hs index 17c906e0b..4f6680935 100644 --- a/hledger-lib/test/easytests.hs +++ b/hledger-lib/test/easytests.hs @@ -1,5 +1,8 @@ +{-# LANGUAGE PackageImports #-} {- Run hledger-lib's easytest tests using the easytest runner. +Note that we use package-qualified import to overcome +Cabal heuristic missing-home-modules. -} -import Hledger +import "hledger-lib" Hledger main = run tests_Hledger