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

Reorganize and clean up test machinery.

Browse source
This commit is contained in:
Eric S. Raymond 2022-04-14 12:27:15 -04:00
parent dd7b664e32
commit 44017d64bb
1 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

56
tests/Makefile
View file

@ -13,22 +13,26 @@ advent?=advent
# Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
ECHO := /bin/echo ECHO := /bin/echo
# The TAP filter. Only affects presentation of the test suite messages
TAPCONSUMER=tapview
# Fall back to safety if our declared TAP consumer does not exist.
# This is helpful in the CI environment, where it would be better for
# the logfiles to carry the raw TAP messages.
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
# Find all *.log entries to test # Find all *.log entries to test
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 clean testlist listcheck savegames savecheck coverage
.PHONY: savecheck regress .PHONY: buildchecks multifile-regress tap count
check: savecheck tapcheck check: savecheck
@make tap | tapview
@echo "=== No diff output is good news." @echo "=== No diff output is good news."
@-advent -x 2>/dev/null # Get usage message into coverage tests @-advent -x 2>/dev/null # Get usage message into coverage tests
@-advent -l /dev/null <pitfall.log >/dev/null @-advent -l /dev/null <pitfall.log >/dev/null
coverage: check
lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
./coverage_dungeon.py
.SUFFIXES: .chk .SUFFIXES: .chk
clean: clean:
@ -58,18 +62,7 @@ savegames:
@$(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*
# Force coverage of cheat edgecases
# Rebuild characterizing tests
buildregress: savegames
$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
@for file in $(TESTLOADS); do \
echo "Remaking $${file}.chk"; \
OPTS=`sed -n /#options:/s///p <$${file}.log`; \
advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
done; \
echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
rm -f scratch.tmp
savecheck: savegames savecheck: savegames
@$(ECHO) "TEST cheat: Bogus option for save file generation" @$(ECHO) "TEST cheat: Bogus option for save file generation"
@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@ -87,13 +80,21 @@ savecheck: savegames
@advent -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1 @advent -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
@rm -f /tmp/coverage* @rm -f /tmp/coverage*
# The TAP filter. Only affects presentation of the test suite messages coverage: check
TAPCONSUMER=tapview lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
./coverage_dungeon.py
# Fall back to safety if our declared TAP consumer does not exist. # Rebuild characterizing tests
# This is helpful in the CI environment, where it would be better for buildchecks: savegames
# the logfiles to carry the raw TAP messages. $(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat) @for file in $(TESTLOADS); do \
echo "Remaking $${file}.chk"; \
OPTS=`sed -n /#options:/s///p <$${file}.log`; \
advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
done; \
echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
rm -f scratch.tmp
RUN_TARGETS=$(TESTLOADS:%=run-regress-%) RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
$(RUN_TARGETS): run-regress-%: %.log $(RUN_TARGETS): run-regress-%: %.log
@ -110,7 +111,4 @@ tap: count $(TEST_TARGETS)
count: count:
@echo 1..$(words $(TEST_TARGETS)) @echo 1..$(words $(TEST_TARGETS))
tapcheck:
@make tap | tapview
# end # end