Skip to content

Commit ccce7c3

Browse files
committed
doctest: provide a separate project file without -Werror (fix #9307)
This became necessary after an upgrade to GHC 9.4, which, apparently, has a subtle change in how -W/-w-related things get interpreted.
1 parent dc08acb commit ccce7c3

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ ghcid-cli :
8181
# https://github.com/haskell/cabal/issues/8734
8282
# Just as well, cabal-install(-solver) doctests (the target below) bitrotted and need some care.
8383
doctest :
84-
cabal repl --with-ghc=doctest --build-depends=QuickCheck --build-depends=template-haskell --repl-options="-w" --project-file="cabal.project.validate" Cabal-syntax
85-
cabal repl --with-ghc=doctest --build-depends=QuickCheck --build-depends=template-haskell --repl-options="-w" --project-file="cabal.project.validate" Cabal
84+
cabal repl --with-ghc=doctest --build-depends=QuickCheck --build-depends=template-haskell --repl-options="-w" --project-file="cabal.project.doctest" Cabal-syntax
85+
cabal repl --with-ghc=doctest --build-depends=QuickCheck --build-depends=template-haskell --repl-options="-w" --project-file="cabal.project.doctest" Cabal
8686

8787

8888
# This is not run as part of validate.sh (we need hackage-security, which is tricky to get).

cabal.project.doctest

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
packages: Cabal-syntax/
2+
packages: Cabal/
3+
packages: cabal-testsuite/
4+
packages: cabal-install/
5+
packages: solver-benchmarks/
6+
7+
packages: cabal-install-solver/
8+
packages: Cabal-QuickCheck/
9+
packages: Cabal-tree-diff
10+
packages: Cabal-described
11+
packages: Cabal-tests
12+
packages: cabal-benchmarks
13+
14+
tests: True
15+
16+
-- avoiding extra dependencies
17+
constraints: rere -rere-cfg
18+
constraints: these -assoc
19+
20+
write-ghc-environment-files: never
21+
22+
program-options
23+
ghc-options: -fno-ignore-asserts
24+

0 commit comments

Comments
 (0)