archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify the test machinery.

Browse source
This commit is contained in:
Eric S. Raymond 2022-04-13 03:59:57 -04:00
parent 337377ab57
commit af7ce31dd9
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/Makefile
View file

@ -17,10 +17,10 @@ ECHO := /bin/echo
TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort) TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
.PHONY: check coverage clean testlist listcheck savegames buildregress .PHONY: check coverage clean testlist listcheck savegames buildregress
.PHONY: savecheck regress .PHONY: savecheck regress tap count multifile-regress
check: tapcheck check: savegames
@echo "=== No diff output is good news." @make tap | $(TAPFILTER)
coverage: check coverage: check
lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV) lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
@ -54,19 +54,19 @@ buildregress: savegames
echo "inven" | advent isofoo.log /dev/stdin >multifile.chk echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
rm -f scratch.tmp rm -f scratch.tmp
# Generate bogus savegames for coverage testing. # Generate bogus savegames for coverage testing. Needed for one test log as well
savegames: savegames:
@$(ECHO) "cheat: Generate save file with -900 deaths" @# Generate save file with -900 deaths
@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie @$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
@$(ECHO) "cheat: Generate save file with -1000 deaths" @# Generate save file with -1000 deaths
@$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000 @$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
@$(ECHO) "cheat: Generate save file with version -1337" @# cheat: Generate save file with version -1337
@$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion @$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
@$(ECHO) "cheat: Generate save file 1000 saves" @# cheat: Generate save file 1000 saves
@$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves @$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
@$(ECHO) "cheat: Generate save file 1000 turns" @# Generate save file 1000 turns
@$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns @$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns
@$(ECHO) "cheat: Generate save file 1000 turns" @# cheat: Generate save file 1000 turns
@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
@rm -f /tmp/cheat* @rm -f /tmp/cheat*
@ -96,24 +96,19 @@ TAPCONSUMER=tapview
# the logfiles to carry the raw TAP messages. # the logfiles to carry the raw TAP messages.
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat) TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
FAILLOG=/tmp/advent-test.log
RUN_TARGETS=$(TESTLOADS:%=run-regress-%) RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
$(RUN_TARGETS): run-regress-%: %.log $(RUN_TARGETS): run-regress-%: %.log
@(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \ @(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \
OPTS=`sed -n /#options:/s///p $<`; \ OPTS=`sed -n /#options:/s///p $<`; \
$(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk") >>$(FAILLOG) $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
multifile-regress: multifile-regress:
@(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk >>$(FAILLOG) @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
TEST_TARGETS = $(RUN_TARGETS) multifile-regress TEST_TARGETS = $(RUN_TARGETS) multifile-regress
tap: count $(TEST_TARGETS) tap: count $(TEST_TARGETS)
count: count:
@echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG) @echo 1..$(words $(TEST_TARGETS))
tapcheck:
@make --no-print-directory tap; tapview <$(FAILLOG)
# end # end