X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=8092aab196f040e7215998cdae2c42426b095960;hb=e46cbdf194bf086ea4d4b091746cb81dd469a443;hp=afc7fdfa2e92ed9d701dbb67a85d2dd3f11d1560;hpb=b0705ba0bbbee2cc1648c5b9adbe0e147e1dfea9;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index afc7fdf..8092aab 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,6 +4,7 @@
 # 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
@@ -20,7 +21,7 @@ check: savecheck regress
 	@-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
@@ -44,6 +45,10 @@ 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*
 
 
@@ -60,6 +65,8 @@ buildregress: savegames
 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"
@@ -70,7 +77,7 @@ savecheck: 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 scratch.tmp /tmp/regress$$$$ /tmp/coverage*
+	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.
@@ -81,6 +88,7 @@ regress:
 	    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;
+	done; \
+	rm -f scratch.tmp /tmp/regress$$$$
 
 # end