slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: adapt to latest shelltestrunner

Browse Source
This commit is contained in:
Simon Michael 2015-03-16 17:55:19 -07:00
parent 6bad57a4d8
commit e91d271ca7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -30,7 +30,7 @@ GHCPKG=ghc-pkg
HADDOCK=haddock HADDOCK=haddock
CABAL=cabal CABAL=cabal
CABALINSTALL=cabal install -w $(GHC) CABALINSTALL=cabal install -w $(GHC)
SHELLTEST=shelltest SHELLTEST=shelltest -j16 --hide-successes
# used for make auto, http://joyful.com/repos/searchpath # used for make auto, http://joyful.com/repos/searchpath
SP=sp SP=sp
@ -402,7 +402,7 @@ tools/generatejournal: tools/generatejournal.hs
check: check:
@echo sanity-check developer environment: @echo sanity-check developer environment:
@($(SHELLTEST) checks -- \ @($(SHELLTEST) checks \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED
@ -479,7 +479,7 @@ unittest-interpreted:
# 16 threads sometimes gives "commitAndReleaseBuffer: resource vanished (Broken pipe)" here but seems harmless # 16 threads sometimes gives "commitAndReleaseBuffer: resource vanished (Broken pipe)" here but seems harmless
functest: bin/hledgerdev tests/addons/hledger-addon functest: bin/hledgerdev tests/addons/hledger-addon
@echo functional tests: @echo functional tests:
@(COLUMNS=80 $(SHELLTEST) --execdir tests --threads=16 \ @(COLUMNS=80 $(SHELLTEST) --execdir tests \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED
# generate dummy add-ons for testing (hledger-addon the rest) # generate dummy add-ons for testing (hledger-addon the rest)
@ -501,7 +501,7 @@ test-ghc-%: # bin/hledgerdev.ghc-$*
@(echo unit tests: \ @(echo unit tests: \
&& bin/hledgerdev.ghc-$* test \ && bin/hledgerdev.ghc-$* test \
&& echo functional tests: \ && echo functional tests: \
&& $(SHELLTEST) tests -w bin/hledgerdev.ghc-$* -- --threads=16 --hide-successes \ && $(SHELLTEST) tests -w bin/hledgerdev.ghc-$* \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED
# run unit and functional tests with main supported GHC versions # run unit and functional tests with main supported GHC versions