Real test coverage dor SAVE_TAMPERING.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 7256b19ee4cecf1b85b5c89ab097ac98ac5adf38..e33e684b1c4fcd0d855e5a24de630fb1c054d6ab 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -13,22 +13,26 @@ advent?=advent
 # 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: savecheck regress
+check: savecheck
+       @make tap | tapview
        @echo "=== No diff output is good news."
-       @-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
 
-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
 
 clean:
@@ -48,6 +52,8 @@ savegames:
        @$(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"
@@ -58,17 +64,7 @@ savegames:
        @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
        @rm -f /tmp/cheat*
 
-
-# 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; \
-       rm -f scratch.tmp
-
+# 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
@@ -79,36 +75,28 @@ savecheck: savegames
        @$(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*
 
-# General regression testing of commands and output; look at the *.log and
-# corresponding *.chk files to see which tests this runs.
-regress:
+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
+
+# Rebuild characterizing tests
+buildchecks: savegames
+       $(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
        @for file in $(TESTLOADS); do \
-           $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
+           echo "Remaking $${file}.chk"; \
            OPTS=`sed -n /#options:/s///p <$${file}.log`; \
-           if $(advent) $$OPTS < $${file}.log >/tmp/regress$$$$ 2>&1; \
-           then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \
-           else echo "*** Nonzero return status on $${file}!"; exit 1; fi \
+           advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
        done; \
-       rm -f scratch.tmp /tmp/regress$$$$
-
-# Steps towards TAP and parallelization.
-# There's a blocker in that the log tests can't be run concurrently
-# due to isssues with colliding save files.
-
-# The TAP filter. Only affects presentation of the test suite messages
-TAPCONSUMER=tappy
-
-# Fall back to safety if our declared TAP consumer does not exist.
-# This is helpful in the CI environment, where it wiuld be better for
-# the logfiles to carry the raw TAP messages. 
-TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
+       echo "inven" | advent isofoo.log /dev/stdin >multifile.chk; \
+       rm -f scratch.tmp
 
 RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
 $(RUN_TARGETS): run-regress-%: %.log
@@ -116,8 +104,14 @@ $(RUN_TARGETS): run-regress-%: %.log
        OPTS=`sed -n /#options:/s///p $<`; \
        $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
 
-tap: savecheck count $(RUN_TARGETS)
+multifile-regress:
+       @(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 $(RUN_TARGETS))
+       @echo 1..$(words $(TEST_TARGETS))
 
 # end