mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-19 10:17:35 +03:00
Merge pull request #254 from ricklupton/make-test-fixes
Changes to make `make test` run
This commit is contained in:
commit
6fa54c94a9
15
Makefile
15
Makefile
@ -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
|
||||||
|
|
||||||
@ -641,7 +642,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
|
||||||
@ -650,13 +651,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-%,\
|
||||||
|
Loading…
Reference in New Issue
Block a user