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

Changes to make make test run

Browse Source 
- test/ADDONS -> test/addons
 - add bin/ to path when running shelltest so hledgerdev is found
 - use `cabal exec` to find shelltest in cabal sandbox
This commit is contained in:
Rick Lupton 2015-05-17 18:24:57 +01:00
parent 934d217523
commit 36535b73d6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -31,7 +31,8 @@ GHCPKG=ghc-pkg
HADDOCK=haddock HADDOCK=haddock
CABAL=cabal CABAL=cabal
CABALINSTALL=cabal install -w $(GHC) CABALINSTALL=cabal install -w $(GHC)
SHELLTEST=shelltest -j16 --hide-successes TESTFRAMEWORKOPTS=-j16 --hide-successes
SHELLTEST=cabal exec -- shelltest --execdir -- $(TESTFRAMEWORKOPTS)
# used for make auto, http://joyful.com/repos/searchpath # used for make auto, http://joyful.com/repos/searchpath
SP=sp SP=sp
@ -637,7 +638,7 @@ functest: bin/hledgerdev tests/addons/hledger-addon \
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\
) )
@echo functional tests: @echo functional tests:
@(COLUMNS=80 $(SHELLTEST) --execdir tests \ @(COLUMNS=80 PATH=`pwd`/bin:$(PATH) $(SHELLTEST) tests \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED
ADDONEXTS=pl py rb sh hs lhs rkt exe com bat ADDONEXTS=pl py rb sh hs lhs rkt exe com bat
@ -646,13 +647,13 @@ tests/addons/hledger-addon: \
generate dummy add-ons for testing (hledger-addon the rest)\ generate dummy add-ons for testing (hledger-addon the rest)\
) )
rm -rf tests/addons/hledger-* rm -rf tests/addons/hledger-*
printf '#!/bin/sh\necho add-on: $$0\necho args: $$*\n' >tests/ADDONS/hledger-addon printf '#!/bin/sh\necho add-on: $$0\necho args: $$*\n' >tests/addons/hledger-addon
for E in '' $(ADDONEXTS); do \ for E in '' $(ADDONEXTS); do \
cp tests/ADDONS/hledger-addon tests/ADDONS/hledger-addon.$$E; done cp tests/addons/hledger-addon tests/addons/hledger-addon.$$E; done
for F in addon. addon2 addon2.hs addon3.exe addon3.lhs addon4.exe add reg; do \ for F in addon. addon2 addon2.hs addon3.exe addon3.lhs addon4.exe add reg; do \
cp tests/ADDONS/hledger-addon tests/ADDONS/hledger-$$F; done cp tests/addons/hledger-addon tests/addons/hledger-$$F; done
mkdir tests/ADDONS/hledger-addondir mkdir tests/addons/hledger-addondir
chmod +x tests/ADDONS/hledger-* chmod +x tests/addons/hledger-*
test-ghc-%: # bin/hledgerdev.ghc-$* \ test-ghc-%: # bin/hledgerdev.ghc-$* \
$(call def-help,test-ghc-%,\ $(call def-help,test-ghc-%,\