# Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
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
TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
-.PHONY: check coverage clean testlist listcheck savegames buildregress
-.PHONY: savecheck regress
+.PHONY: check clean testlist listcheck savegames savecheck coverage
+.PHONY: buildchecks multifile-regress tap count
-check: tapcheck
+check: savecheck
+ @make tap | tapview
@echo "=== No diff output is good news."
-
-coverage: check
- lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
- genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
- @-advent -x 2>/dev/null # Get usage message into coverage tests
+ @-advent -x 2>/dev/null || exit 0 # Get usage message into coverage tests
@-advent -l /dev/null <pitfall.log >/dev/null
- make savecheck
- ./coverage_dungeon.py
.SUFFIXES: .chk
if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
done
-# 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
-
-# Generate bogus savegames for coverage testing.
+# Generate bogus savegames.
savegames:
@$(ECHO) "cheat: Generate save file with -900 deaths"
@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
@$(ECHO) "cheat: Generate save file with -1000 deaths"
@$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
+ @$(ECHO) "cheat: Generate tamper-detection test"
+ @$(PARDIR)/cheat -d 2000 -o cheat_savetamper.adv > /tmp/cheat_savetamper
@$(ECHO) "cheat: Generate save file with version -1337"
@$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
@$(ECHO) "cheat: Generate save file 1000 saves"
@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
@rm -f /tmp/cheat*
-# Force coverage of various edge cases
+# Force coverage of cheat edgecases
savecheck: savegames
@$(ECHO) "TEST cheat: Bogus option for save file generation"
@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@$(ECHO) "TEST cheat: Fail to save to invalid path"
@$(PARDIR)/cheat -o / 2> /tmp/coverage_cheat_badoutput | true
@$(ECHO) "TEST advent: Start with invalid file with -r"
- @advent -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
+ @$(advent) -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
@$(ECHO) "TEST advent: Start with invalid file with -l"
- @advent -l / < pitfall.log > /tmp/coverage_advent_logfail 2>&1 || exit 1
+ @$(advent) -l / < pitfall.log > /tmp/coverage_advent_logfail 2>&1 || exit 1
@$(ECHO) "TEST advent: Test -r with valid input"
- @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*
-# 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)
+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
-FAILLOG=/tmp/advent-test.log
+# Rebuild characterizing tests
+buildchecks: 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
RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
$(RUN_TARGETS): run-regress-%: %.log
@(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \
OPTS=`sed -n /#options:/s///p $<`; \
- $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk") >>$(FAILLOG)
+ $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
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
tap: count $(TEST_TARGETS)
+ rm -f scratch.tmp
count:
- @echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG)
-
-tapcheck:
- @make --no-print-directory tap; tapview <$(FAILLOG)
+ @echo 1..$(words $(TEST_TARGETS))
# end
projects / open-adventure.git / blobdiff