Skip to content

Commit d87c44e

Browse files
committed
Makefile: disable ansi tricks for tasty; use v2- instead of new-.
1 parent 2b42733 commit d87c44e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ REVISION?=1
2222
BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T -RTS $(if $(PATTERN),--pattern "$(PATTERN)",)
2323

2424
quick:
25-
stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes $(TESTARGS)'
25+
stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)'
2626

2727
quick-cabal:
28-
cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests
29-
cabal new-build -j4 . --disable-optimization
30-
cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
28+
cabal v2-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests
29+
cabal v2-build -j4 . --disable-optimization
30+
cabal v2-run test-pandoc --disable-optimization -- --hide-successes --ansi-tricks=false $(TESTARGS)
3131

3232
full-cabal:
33-
cabal new-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks
34-
cabal new-build . --disable-optimization
35-
cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
33+
cabal v2-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks
34+
cabal v2-build . --disable-optimization
35+
cabal v2-run test-pandoc --disable-optimization -- --hide-successes --ansi-tricks=false $(TESTARGS)
3636

3737
full:
38-
stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)'
38+
stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes--ansi-tricks-false' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)'
3939

4040
ghci:
4141
stack ghci --flag 'pandoc:embed_data_files'
@@ -46,7 +46,7 @@ haddock:
4646
# Note: to accept current results of golden tests,
4747
# make test TESTARGS='--accept'
4848
test:
49-
stack test --flag 'pandoc:embed_data_files' --fast --test-arguments='-j4 --hide-successes $(TESTARGS)' --ghc-options '$(GHCOPTS)'
49+
stack test --flag 'pandoc:embed_data_files' --fast --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)' --ghc-options '$(GHCOPTS)'
5050

5151
ghcid:
5252
ghcid -c "stack repl --flag 'pandoc:embed_data_files'"

0 commit comments

Comments
 (0)