Skip to content

Commit 94fe5c2

Browse files
committed
make tests $STACKYAML-aware, fix GHC 8.10 CI
1 parent 3746588 commit 94fe5c2

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ export LANG = en_US.UTF-8
66
# which stack.yaml file (& ghc version) to use, can be overridden by STACK env var
77
STACKYAML ?= stack.yaml
88

9+
# used below and also in tests which run stack (eg large-output.test)
10+
STACKYAMLOPT = --stack-yaml=$(STACKYAML)
11+
912
# the current base stack command
10-
STACK = stack --stack-yaml $(STACKYAML)
13+
STACK = stack $(STACKYAMLOPT)
1114

1215
# the shelltest executable built with current stack
1316
SHELLTESTEXE = $(shell $(STACK) path --local-install-root)/bin/shelltest

tests/format1/large-output.test

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/format1/large-regexp.test

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/format2/large-output.test

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/format2/regexps.test

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/format3/large-output.test

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/format3/regexps.test

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)