X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=07d39fd448766bd159e5f8bbd6aea6d4875a7b51;hb=d5942e17321e69ddcc71923b3722679067026f79;hp=6e657ef66411dbd47614dfb0484b68faf1316c7e;hpb=2781413fa975e50cf0e1bf9f27eeecf83e84ce38;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index 6e657ef..07d39fd 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,7 +11,7 @@ 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
 
 .SUFFIXES: .chk
 
@@ -26,29 +26,39 @@ 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:
+buildregress: savegames
+	../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`; \
 	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done; \
 	rm -f scratch.tmp
-regress:
-	$(ECHO) -n "Generate save file with -1000 deaths: "
-	../cheat -d -1000 -o cheat_numdie.adv
-	$(ECHO) -n "Generate save file with version -1337: "
-	../cheat -v -1337 -o resume_badversion.adv
-	$(ECHO) -n "Generate save file 1000 saves: "
-	../cheat -s -1000 -o thousand_saves.adv
-	$(ECHO) -n "Bogus option for save file generation: "
-	../cheat -QqQ | true
-	$(ECHO) -n "Fail to save because we omit -o: "
-	../cheat -d 1 | true
-	$(ECHO) -n "Fail to save to invalid path: "
-	../cheat -o /badfilename.adv | true
+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"
+	../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
 	@for file in $(TESTLOADS); do \
 	    $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
 	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
@@ -56,6 +66,6 @@ regress:
 	    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$$$$
+	rm -f scratch.tmp /tmp/regress$$$$ /tmp/coverage*
 
 # end