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

tools: make tweaks, use a known-good version of shelltest

Browse Source
This commit is contained in:
Simon Michael 2012-03-28 18:16:46 +00:00
parent e093431b4d
commit 88f5eaa03c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -164,7 +164,7 @@ bin/hledger.ghc-%:
cd hledger; ghc-$* --make $(MAIN) -o ../$@ $(BUILDFLAGS) -outputdir .ghc-$* cd hledger; ghc-$* --make $(MAIN) -o ../$@ $(BUILDFLAGS) -outputdir .ghc-$*
# build hledger with the main supported GHC versions # build hledger with the main supported GHC versions
hledger-all-ghcs: \ bin/hledger-ghc-all: \
bin/hledger.ghc-7.0.4 \ bin/hledger.ghc-7.0.4 \
bin/hledger.ghc-7.2.2 \ bin/hledger.ghc-7.2.2 \
bin/hledger.ghc-7.4.1 \ bin/hledger.ghc-7.4.1 \
@ -303,6 +303,8 @@ set-up-rc-repo:
###################################################################### ######################################################################
# TESTING # TESTING
SHELLTEST=shelltest-1.2.1.ghc-7.0.4
test: codetest test: codetest
# quick code tests - run all the time # quick code tests - run all the time
@ -342,16 +344,16 @@ 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/hledger functest: bin/hledger
@echo functional tests: @echo functional tests:
(shelltest tests -- --threads=16 --hide-successes \ ($(SHELLTEST) tests -- --threads=16 --hide-successes \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED
# run unit and functional tests with a specific GHC version # run unit and functional tests with a specific GHC version
test-ghc-%: # bin/hledger.ghc-$* test-ghc-%: # bin/hledger.ghc-$*
@echo testing with ghc version $* @echo; echo testing hledger built with ghc-$*
@(echo unit tests: \ @(echo unit tests: \
&& bin/hledger.ghc-$* test \ && bin/hledger.ghc-$* test \
&& echo functional tests: \ && echo functional tests: \
&& shelltest tests -w bin/hledger.ghc-$* -- --threads=16 --hide-successes \ && $(SHELLTEST) tests -w bin/hledger.ghc-$* -- --threads=16 --hide-successes \
&& 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