X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=tests%2FMakefile;h=fc4801fc11e4378b6542f30c3d250f37d64117e5;hp=62075159918bc3eb3b7dea589e977564409b6e32;hb=7ad7dd209e48478e067001e2671bce73b34632e9;hpb=2d71fe813793334a0e2c46d8b942dba9a5aff208

diff --git a/tests/Makefile b/tests/Makefile
index 6207515..fc4801f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,11 +1,15 @@
 # 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}
+PARDIR=$(realpath ..)
+PATH := $(PARDIR):$(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
 
@@ -21,8 +25,9 @@ check: savecheck regress
 	@-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
+	lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
+	genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
+	./coverage_dungeon.py
 
 .SUFFIXES: .chk
 
@@ -39,22 +44,24 @@ listcheck:
 
 # 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*
+	@$(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
-	../cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
+	$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
 	@for file in $(TESTLOADS); do \
 	    echo "Remaking $${file}.chk"; \
 	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
@@ -63,19 +70,21 @@ buildregress: savegames
 	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: 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*
+	@$(ECHO) "TEST cheat: Bogus option for save file generation"
+	@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
+	@$(ECHO) "TEST cheat: No save file specified"
+	@$(PARDIR)/cheat 2>/dev/null | true
+	@$(ECHO) "TEST cheat: Fail to save because we omit -o"
+	@$(PARDIR)/cheat -d 1 2> /tmp/coverage_cheat_nooutput | true
+	@$(ECHO) "TEST cheat: Fail to save to invalid path"
+	@$(PARDIR)/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 -l"
+	@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.
@@ -83,7 +92,7 @@ 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; \
+	    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; \