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

diff --git a/tests/Makefile b/tests/Makefile
index f3ee2d6..d2ccb14 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,7 +11,11 @@ ECHO := /bin/echo
 check: 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 ..
+	genhtml -o ../coverage/ ../advent.info
 
 .SUFFIXES: .chk
 
@@ -26,15 +30,19 @@ listcheck:
 	    if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
 	done
 
+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
+	rm -f /tmp/cheat*
+
 # 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"
+buildregress: savegames
 	../cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
 	@for file in $(TESTLOADS); do \
 	    echo "Remaking $${file}.chk"; \
@@ -42,13 +50,7 @@ buildregress:
 	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done; \
 	rm -f scratch.tmp
-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
+regress: savegames
 	$(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"
@@ -56,11 +58,11 @@ regress:
 	$(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
+	advent -r /badfilename < pitfall.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
+	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 < quit.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
+	advent -r thousand_saves.adv < pitfall.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`; \