X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=tests%2FMakefile;h=b364432475082e487d58b2af6b27bd81cd09a4e5;hp=f3ee2d6dba1c5ade2d8ed153e568a67b1d5b3e63;hb=91c9fa30665ef1c628b8e08eb790d08f58ef51db;hpb=6152e35afd8b5f71977b5961b9a8ec788ae8942e

diff --git a/tests/Makefile b/tests/Makefile
index f3ee2d6..b364432 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,17 +1,32 @@
 # Test-suite makefile for reposurgeon
 
-# Use absolute path so tests that change working directory still use 
+# 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}
+GCOV?=gcov
+
+# Make this overrideable so it's easier to test old versions
+advent?=advent
 
 # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
 ECHO := /bin/echo
 
-check: regress
+# 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
+
+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 <quit.log >/dev/null
+	@-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
+	python3 coverage_dungeon.py
 
 .SUFFIXES: .chk
 
@@ -26,15 +41,23 @@ listcheck:
 	    if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
 	done
 
-# General regression testing of commands and output; look at the *.log and
-# corresponding *.chk files to see which tests this runs.
-TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
-buildregress:
-	$(ECHO) "Generate save file with -1000 deaths: "
-	../cheat -d -1000 -o cheat_numdie.adv
-	$(ECHO) "Generate save file with version -1337: "
-	../cheat -v -1337 -o resume_badversion.adv
-	$(ECHO) "TEST cheat: Generate save file 1000 saves"
+# Generate bogus savegames.
+savegames:
+	@$(ECHO) "cheat: Generate save file with -1000 deaths"
+	@../cheat -d -1000 -o cheat_numdie.adv > /tmp/cheat_numdie
+	@$(ECHO) "cheat: Generate save file with version -1337"
+	@../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
+	@$(ECHO) "cheat: Generate save file 1000 turns"
+	@../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
+	@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"; \
@@ -42,32 +65,34 @@ buildregress:
 	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done; \
 	rm -f scratch.tmp
+
+savecheck: savegames
+	@$(ECHO) "TEST cheat: Bogus option for save file generation"
+	@../cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
+	@$(ECHO) "TEST cheat: No save file specified"
+	@../cheat 2>/dev/null | true
+	@$(ECHO) "TEST cheat: Fail to save because we omit -o"
+	@../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
+	@$(ECHO) "TEST advent: Start with invalid file with -r"
+	@advent -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
+	@$(ECHO) "TEST advent: Start with invalid file with -r"
+	@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
+	@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:
-	$(ECHO) "TEST cheat: Generate save file with -1000 deaths"
-	../cheat -d -1000 -o cheat_numdie.adv > /tmp/regressdumdie
-	$(ECHO) "TEST cheat: Generate save file with version -1337"
-	../cheat -v -1337 -o resume_badversion.adv > /tmp/regressbadversion
-	$(ECHO) "TEST cheat: Generate save file 1000 saves"
-	../cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
-	$(ECHO) "TEST cheat: Bogus option for save file generation"
-	../cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
-	$(ECHO) "TEST cheat: Fail to save because we omit -o"
-	../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
-	$(ECHO) "TEST advent: Start with invalid file with -r"
-	advent -r /badfilename < quit.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
-	$(ECHO) "TEST advent: Start with invalid file with -r"
-	advent -l / < quit.log > /tmp/coverage_advent_logfail 2>&1 || exit 1
-	$(ECHO) "TEST advent: Test -r with valid input"
-	advent -r thousand_saves.adv < quit.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
 	@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; \
+	    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$$$$ /tmp/coverage*
+	rm -f scratch.tmp /tmp/regress$$$$
 
 # end