Skip to content
Snippets Groups Projects
Unverified Commit ee1fd525 authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub
Browse files

Merge pull request #10231 from sol/patch-1

Makefile:  Use `cabal doctest`
parents 356c2f4c 2396ec29
No related branches found
No related tags found
No related merge requests found
Pipeline #98760 passed
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
CABALBUILD := cabal build CABALBUILD := cabal build
CABALRUN := cabal run CABALRUN := cabal run
# The newer and prefered way to call the doctest tool is: # We have to avoid allow-newer.
# $ cabal repl --with-ghc=doctest
# SEE: https://github.com/haskell/cabal/issues/8504
# There is but one caveat, we have to avoid allow-newer.
# SEE: https://github.com/haskell/cabal/issues/6859 # SEE: https://github.com/haskell/cabal/issues/6859
DOCTEST := cabal repl --with-ghc=doctest --repl-options="-w" --ghc-options="-Wwarn" --allow-newer=False DOCTEST := cabal doctest --allow-newer=False
# default rules # default rules
...@@ -107,11 +104,11 @@ ghcid-cli : ...@@ -107,11 +104,11 @@ ghcid-cli :
.PHONY: doctest .PHONY: doctest
doctest : doctest :
$(DOCTEST) Cabal-syntax cd Cabal-syntax && $(DOCTEST)
$(DOCTEST) Cabal-described cd Cabal-described && $(DOCTEST)
$(DOCTEST) --build-depends=QuickCheck Cabal cd Cabal && $(DOCTEST)
$(DOCTEST) cabal-install-solver cd cabal-install-solver && $(DOCTEST)
$(DOCTEST) cabal-install cd cabal-install && $(DOCTEST)
# This is not run as part of validate.sh (we need hackage-security, which is tricky to get). # This is not run as part of validate.sh (we need hackage-security, which is tricky to get).
.PHONY: doctest-cli .PHONY: doctest-cli
...@@ -120,7 +117,7 @@ doctest-cli : ...@@ -120,7 +117,7 @@ doctest-cli :
.PHONY: doctest-install .PHONY: doctest-install
doctest-install: doctest-install:
cabal install doctest --overwrite-policy=always --ignore-project cabal install doctest --overwrite-policy=always --ignore-project --flag cabal-doctest
# tests # tests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment