X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=7c27f117efb3bbe643841f2935d0bc5b28a75168;hb=4069bf210b68d0aaa44ca30eff264d7eb93d8d70;hp=4d7f21518262bc911ac7cc22cc165ac235c1889d;hpb=ee7bacc9ec2d701138586fe2b363702c4f46deee;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index 4d7f215..7c27f11 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-# 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
@@ -17,17 +17,17 @@ ECHO := /bin/echo
 TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 
 .PHONY: check coverage clean testlist listcheck savegames buildregress
-.PHONY: savecheck regress
+.PHONY: savecheck regress tap count multifile-regress
 
-check: savecheck regress
-	@echo "=== No diff output is good news."
-	@-advent -x 2>/dev/null	# Get usage message into coverage tests
-	@-advent -l /dev/null <pitfall.log >/dev/null
+check: savegames
+	@make tap | $(TAPFILTER)
 
 coverage: check
-	ls -lR $(PARDIR)
 	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 -l /dev/null <pitfall.log >/dev/null
+	make savecheck
 	./coverage_dungeon.py
 
 .SUFFIXES: .chk
@@ -43,23 +43,6 @@ listcheck:
 	    if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
 	done
 
-# 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 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 -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
-	@$(ECHO) "cheat: Generate save file 1000 turns"
-	@$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns
-	@$(ECHO) "cheat: Generate save file 1000 turns"
-	@$(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
@@ -68,8 +51,26 @@ buildregress: savegames
 	    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.  Needed for one test log as well 
+savegames:
+	@# Generate save file with -900 deaths
+	@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
+	@# Generate save file with -1000 deaths
+	@$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
+	@# cheat: Generate save file with version -1337
+	@$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
+	@# cheat: Generate save file 1000 saves
+	@$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
+	@# Generate save file 1000 turns
+	@$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns
+	@# cheat: Generate save file 1000 turns
+	@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
+	@rm -f /tmp/cheat*
+
+# Force coverage of various edge cases
 savecheck: savegames
 	@$(ECHO) "TEST cheat: Bogus option for save file generation"
 	@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@@ -87,16 +88,27 @@ savecheck: savegames
 	@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:
-	@for file in $(TESTLOADS); do \
-	    $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
-	    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 \
-	done; \
-	rm -f scratch.tmp /tmp/regress$$$$
+# 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)
+
+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)
+count:
+	@echo 1..$(words $(TEST_TARGETS))
 
 # end