From efa101091c118d000907bb1c1ebbdbd5352c15e7 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 20 Dec 2024 11:38:31 -1000 Subject: [PATCH] fix:web: -threaded is needed in test suite now also --- hledger-web/hledger-web.cabal | 8 ++++++-- hledger-web/package.yaml | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index f28920cb5..76efb3e2d 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -208,6 +208,8 @@ library , yesod-static >=1.4 && <1.7 , yesod-test default-language: Haskell2010 + if flag(threaded) + ghc-options: -threaded -with-rtsopts=-T if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -228,6 +230,8 @@ executable hledger-web , base-compat >=0.14.0 , hledger-web default-language: Haskell2010 + if flag(threaded) + ghc-options: -threaded -with-rtsopts=-T if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) @@ -236,8 +240,6 @@ executable hledger-web cpp-options: -DDEBUG if flag(library-only) buildable: False - if flag(threaded) - ghc-options: -threaded -with-rtsopts=-T test-suite test type: exitcode-stdio-1.0 @@ -251,6 +253,8 @@ test-suite test , base-compat >=0.14.0 , hledger-web default-language: Haskell2010 + if flag(threaded) + ghc-options: -threaded -with-rtsopts=-T if (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT if flag(dev) diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 28086eacf..753b296af 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -78,6 +78,8 @@ ghc-options: - -Wincomplete-uni-patterns when: +- condition: flag(threaded) + ghc-options: -threaded -with-rtsopts=-T - condition: (flag(dev)) || (flag(library-only)) cpp-options: -DDEVELOPMENT # This causes a warning when uploading to hackage: @@ -165,8 +167,6 @@ executables: when: - condition: flag(library-only) buildable: false - - condition: flag(threaded) - ghc-options: -threaded -with-rtsopts=-T tests: test: