X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=8ea00c6e6d73ac0fe381aa06b4c11a9c11e574be;hb=9b89dd2829c4d8315f35e2d80b44542c3f2b4115;hp=c93f6bbeb49d190b2b0f1ba36d38d0fbf4909463;hpb=bd1b89326363092f568d80c3959feb7ed9cd7cb9;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index c93f6bb..8ea00c6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,9 +1,10 @@
-# Test-suite makefile for reposurgeon
+# Test-suite makefile for opeb-adventure
 
 # Use absolute path so tests that change working directory still use
 # scripts from parent directory.  Note that using $PWD seems to fail
 # here under Gitlab's CI environment.
-PATH := $(realpath ..):$(realpath .):${PATH}
+PARDIR=$(realpath ..)
+PATH := $(PARDIR):$(realpath .):${PATH}
 GCOV?=gcov
 
 # Make this overrideable so it's easier to test old versions
@@ -12,26 +13,30 @@ 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 ../advent.info -c -d .. --gcov-tool=$(GCOV)
-	genhtml -o ../coverage/ ../advent.info
-	./coverage_dungeon.py
-
 .SUFFIXES: .chk
 
 clean:
-	rm -fr *~ adventure.text *.adv scratch.tmp
+	rm -fr *~ *.adv scratch.tmp *.ochk
 
 # Show summary lines for all tests.
 testlist:
@@ -43,56 +48,78 @@ listcheck:
 
 # 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"
-	@../cheat -d -1000 -o cheat_numdie.adv > /tmp/cheat_numdie
+	@$(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"
-	@../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 -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"
-	@../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 -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
+	@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
 	@rm -f /tmp/cheat*
 
-
-# Rebuild characterizing tests
-buildregress: savegames
-	../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"
-	@../cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
+	@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
 	@$(ECHO) "TEST cheat: No save file specified"
-	@../cheat 2>/dev/null | true
+	@$(PARDIR)/cheat 2>/dev/null | true
 	@$(ECHO) "TEST cheat: Fail to save because we omit -o"
-	@../cheat -d 1 2> /tmp/coverage_cheat_nooutput | true
+	@$(PARDIR)/cheat -d 1 2> /tmp/coverage_cheat_nooutput | true
 	@$(ECHO) "TEST cheat: Fail to save to invalid path"
-	@../cheat -o / 2> /tmp/coverage_cheat_badoutput | true
+	@$(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$$$$
+	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")
+
+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 $(TEST_TARGETS))
+
+# The following machinery tests the gane against a binary made from the advent430 branch
+# The diff file produced has new spellings in it.
+
+ancient:
+	for x in *.log; do stem=$${x%.log}; echo $${stem}; ./advent430 <$${stem}.log | ./oldfilter >$${stem}.ochk; done 
+	for x in *.log; do stem=$${x%.log}; diff -u $${stem}.chk $${stem}.log; done
+	rm *.ochk
 
 # end