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

diff --git a/tests/Makefile b/tests/Makefile
index d2ccb14..6207515 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,17 +4,24 @@
 # scripts from parent directory.  Note that using $PWD seems to fail
 # here under Gitlab's CI environment.
 PATH := $(realpath ..):$(realpath .):${PATH}
+GCOV?=gcov
 
 # 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 <pitfall.log >/dev/null
 
 coverage: check
-	lcov -t "advent" -o ../advent.info -c -d ..
+	lcov -t "advent" -o ../advent.info -c -d .. --gcov-tool=$(GCOV)
 	genhtml -o ../coverage/ ../advent.info
 
 .SUFFIXES: .chk
@@ -30,6 +37,7 @@ 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 -1000 deaths"
 	../cheat -d -1000 -o cheat_numdie.adv > /tmp/cheat_numdie
@@ -37,11 +45,14 @@ savegames:
 	../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*
 
-# 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)
+
+# Rebuild characterizing tests
 buildregress: savegames
 	../cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
 	@for file in $(TESTLOADS); do \
@@ -50,7 +61,8 @@ buildregress: savegames
 	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done; \
 	rm -f scratch.tmp
-regress: savegames
+
+savecheck: 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"
@@ -63,6 +75,11 @@ regress: savegames
 	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:
 	@for file in $(TESTLOADS); do \
 	    $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
 	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
@@ -70,6 +87,6 @@ regress: savegames
 	    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