X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=8ea00c6e6d73ac0fe381aa06b4c11a9c11e574be;hb=9b89dd2829c4d8315f35e2d80b44542c3f2b4115;hp=59f29721d84eec127bbbdd9f6bae6ad0480ec4a9;hpb=44017d64bb811868e71172af3daa84a1cf7a4012;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index 59f2972..8ea00c6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -30,13 +30,13 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 check: savecheck
 	@make tap | tapview
 	@echo "=== No diff output is good news."
-	@-advent -x 2>/dev/null	# Get usage message into coverage tests
+	@-advent -x 2>/dev/null	|| exit 0 # Get usage message into coverage tests
 	@-advent -l /dev/null <pitfall.log >/dev/null
 
 .SUFFIXES: .chk
 
 clean:
-	rm -fr *~ adventure.text *.adv scratch.tmp
+	rm -fr *~ *.adv scratch.tmp *.ochk
 
 # Show summary lines for all tests.
 testlist:
@@ -52,6 +52,8 @@ savegames:
 	@$(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 tamper-detection test"
+	@$(PARDIR)/cheat -d 2000 -o cheat_savetamper.adv > /tmp/cheat_savetamper
 	@$(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"
@@ -73,11 +75,11 @@ savecheck: savegames
 	@$(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
+	@$(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
+	@$(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
+	@$(advent) -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
 	@rm -f /tmp/coverage*
 
 coverage: check
@@ -93,7 +95,7 @@ buildchecks: savegames
 	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
 	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done; \
-	echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
+	echo "inven" | advent isofoo.log /dev/stdin >multifile.chk; \
 	rm -f scratch.tmp
 
 RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
@@ -108,7 +110,16 @@ multifile-regress:
 TEST_TARGETS = $(RUN_TARGETS) multifile-regress
 
 tap: count $(TEST_TARGETS)
+	rm -f scratch.tmp
 count:
 	@echo 1..$(words $(TEST_TARGETS))
 
+# The following machinery tests the gane against a binary made from the advent430 branch
+# The diff file produced has new spellings in it.
+
+ancient:
+	for x in *.log; do stem=$${x%.log}; echo $${stem}; ./advent430 <$${stem}.log | ./oldfilter >$${stem}.ochk; done 
+	for x in *.log; do stem=$${x%.log}; diff -u $${stem}.chk $${stem}.log; done
+	rm *.ochk
+
 # end