Skip to content

Commit 3004761

Browse files
committed
tests: simplify: assume 'ghc' works, drop use of STACKYAMLOPT
1 parent fda7f62 commit 3004761

7 files changed

Lines changed: 9 additions & 14 deletions

File tree

Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,14 @@ 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
10-
STACKYAMLOPT = --stack-yaml=$(STACKYAML)
11-
129
# the current base stack command
13-
STACK = stack --silent $(STACKYAMLOPT)
10+
STACK = stack --stack-yaml=$(STACKYAML)
11+
# STACK = stack --silent --stack-yaml=$(STACKYAML)
1412

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

18-
# the base shelltest command with common options,
19-
# and the STACKYAMLOPT env var which helps any tests
20-
# which run stack themselves (eg large-output.test)
21-
SHELLTEST = STACKYAMLOPT="$(STACKYAMLOPT)" $(SHELLTESTEXE) --exclude /_ -j16 --hide-successes
16+
SHELLTEST = $(SHELLTESTEXE) --exclude /_ -j16 --hide-successes
2217

2318
# standard targets
2419

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)