Skip to content

Commit 136a7f1

Browse files
committed
make tests more robust
1 parent af8ddba commit 136a7f1

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ STACKYAML ?= stack.yaml
1010
STACKYAMLOPT = --stack-yaml=$(STACKYAML)
1111

1212
# the current base stack command
13-
STACK = stack $(STACKYAMLOPT)
13+
STACK = stack --silent $(STACKYAMLOPT)
1414

1515
# the shelltest executable built with current stack
1616
SHELLTESTEXE = $(shell $(STACK) path --local-install-root)/bin/shelltest
@@ -25,10 +25,10 @@ SHELLTEST = STACKYAMLOPT="$(STACKYAMLOPT)" $(SHELLTESTEXE) --exclude /_ -j16 --h
2525
default: build
2626

2727
build:
28-
$(STACK) build
28+
@$(STACK) build
2929

3030
install:
31-
$(STACK) install
31+
@$(STACK) install
3232

3333
ghci:
3434
@echo
@@ -47,7 +47,7 @@ test: testcross testunix testbash testexamples
4747
# run cross-platform shell tests
4848
testcross: build
4949
@echo; echo "cross-platform tests should succeed:"
50-
$(SHELLTEST) -w $(SHELLTESTEXE) tests -x /bash -x /examples -x .windows -x .unix -w $(SHELLTESTEXE)
50+
$(SHELLTEST) -w $(SHELLTESTEXE) tests -x /bash -x /examples -x .windows -x .unix
5151

5252
# run unix-specific shell tests
5353
testunix: build

tests/examples/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Copy/pasted by hand for now, should be kept in sync.
33

44
To watch for errors:
55

6-
$ ls *.test | entr shelltest . -j16 --hide
6+
$ watchexec -- make test

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)