X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=66280f4efe7b981419f4687fc567abb5ec3a8e85;hb=e99cc69de01220b80400e42e7cb625746d31e6f2;hp=8d61d27109c6d33143f76a8370b581e29a8619f7;hpb=dc8b19bcdc00586af906af4147855662efb5287e;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index 8d61d27..66280f4 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,7 @@
-# Test-suite makefile for opeb-adventure
+# Test-suite makefile for open-adventure
+
+# SPDX-FileCopyrightText: Eric S. Raymond <esr@thyrsus.com>
+# SPDX-License-Identifier: BSD-2-Clause
 
 # Use absolute path so tests that change working directory still use
 # scripts from parent directory.  Note that using $PWD seems to fail
@@ -45,28 +48,22 @@ listcheck:
 	done
 
 # Generate bogus savegames.
-sgame1:
+cheat_numdie.adv:
 	@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
-	@./outcheck.sh "cheat: Generate save file with -900 deaths"
-sgame2:
+cheat_numdie1000.adv:
 	@$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
-	@./outcheck.sh "cheat: Generate save file with -1000 deaths"
-sgame3:
+cheat_savetamper.adv:
 	@$(PARDIR)/cheat -d 2000 -o cheat_savetamper.adv > /tmp/cheat_savetamper
-	@./outcheck.sh "cheat: Generate tamper-detection test"
-sgame4:
+resume_badversion.adv:
 	@$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
-	@./outcheck.sh "cheat: Generate save file with version -1337"
-sgame5:
+thousand_saves.adv:
 	@$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
-	@./outcheck.sh "cheat: Generate save file 1000 saves"
-sgame6:
-	@$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns
-	@./outcheck.sh "cheat: Generate save file 1000 turns"
-sgame7:
-	@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
-	@./outcheck.sh "cheat: Generate save file 1000 turns"
-SGAMES = sgame1 sgame2 sgame3 sgame4 sgame5 sgame6 sgame7
+thousand_turns.adv:
+	@$(PARDIR)/cheat -t -1000 -o thousand_turns.adv > /tmp/cheat_1000turns
+thousand_limit.adv:
+	@$(PARDIR)/cheat -l -1000 -o thousand_limit.adv > /tmp/cheat_1000limit
+SGAMES = cheat_numdie.adv cheat_numdie1000.adv cheat_savetamper.adv resume_badversion.adv \
+	thousand_saves.adv thousand_turns.adv thousand_limit.adv
 
 # Force coverage of cheat edgecases
 scheck1:
@@ -92,6 +89,9 @@ scheck7:
 	@./outcheck.sh "test -r with valid input"
 SCHECKS = scheck1 scheck2 scheck3 scheck4 scheck5 scheck6 scheck7
 
+# Don't run this from here, you'll get cryptic warnings and no good result
+# if the advent binary wasn't built with coverage flags.  Do "make clean coverage"
+# from the top-level directory.
 coverage: check
 	lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
 	genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
@@ -105,39 +105,60 @@ 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 issue36.log /dev/stdin >multifile.chk; \
 	rm -f scratch.tmp
 
 RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
 $(RUN_TARGETS): run-regress-%: %.log
 	@(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \
 	OPTS=`sed -n /#options:/s///p $<`; \
-	$(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
+	$(advent) $$OPTS <$< | tapdiffer "$${test}: $${legend}" "$${test}.chk")
 
 multifile-regress:
-	@(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
+	@(echo "inven" | advent issue36.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
 
-TEST_TARGETS = $(SGAMES) $(SCHECKS) $(RUN_TARGETS) multifile-regress
+TEST_TARGETS = $(SCHECKS) $(RUN_TARGETS) multifile-regress
 
-tap: count $(TEST_TARGETS)
+tap: count $(SGAMES) $(TEST_TARGETS)
 	@rm -f scratch.tmp /tmp/coverage* /tmp/cheat*
 count:
 	@echo 1..$(words $(TEST_TARGETS))
 
-# The following machinery tests the gane against a binary made from
+foobar:
+	exit 1
+
+
+# The following machinery tests the game against a binary made from
 # the advent430 branch To use it, switch to that branch, build the
-# binary, sand run it once to generate adventure.data, then switch
-# back to master leaving advent430 and adventure.data in place (make
-# clean does not remove them).
+# binary, run it once to generate adventure.data, then switch back to
+# master leaving advent430 and adventure.data in place (make clean
+# does not remove them).
+#
+# make clean                 # Clean up object files, laving a bare source tree
+# git checkout advent430     # Check out the advent430 branch
+# make                       # Build the advent430 binary
+# advent430                  # Run it.  Answer the novice question and quit
+# make clean                 # Remove .o files
+# git checkout master        # Go back to master branch
+# make                       # Rebuild advent.
 #
 # The diff file produced has corrected spellings in it. That's what oldfilter
-# is for, to massage out the orioginal dpellings and avoid noise diffs.
+# is for, to massage out the original spellings and avoid noise diffs.
 # Diffs in amount of whitespace and trailing whitespace are ignored
 #
 # A magic comment of NOCOMPARE in a log file excludes it from this comparison.
-# First use of this is to avoid a spurious mismatch on the news text.
+# making it a skipped test in the TAP view. First use of this was to avoid a
+# spurious mismatch on the news text. Other uses avoid spurious mismatches due
+# to bug fixes.
+#
+# When adding more tests, bear in mind that any game that continues after a
+# resurrection will need a NOCOMPARE. At some point in the forward port,
+# resurrection was accidentally changed in a way that messed wil the LCG chain.
+#
+# The *.chk files need not be up-to-date for this to work.
+#
 TAPFILTER=tapview
-ancient: $(SGAMES)
+oldcompare:
 	@if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi
 	@-(for x in *.log; do \
 		stem=$${x%.log}; \
@@ -146,10 +167,15 @@ ancient: $(SGAMES)
 			then echo "not ok - $${stem}.ochk: $${legend} # SKIP"; \
 			else \
 				./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \
-				./newfilter <$${stem}.chk | tapdiffer -w "$${stem}: $${legend}" $${stem}.ochk; \
+				../advent <$${stem}.log >$${stem}.log-new; \
+				./newfilter <$${stem}.log-new | tapdiffer -b "$${stem}: $${legend}" $${stem}.ochk; \
 			fi; \
 	done; \
 	echo 1..$(words $(shell ls *.log))) | $(TAPFILTER)
-	@rm *.ochk advent430 adventure.data
+	@rm *.ochk *-new advent430 adventure.data
+
+# List all NOMPARE tests.
+residuals:
+	@grep -n NOCOMPARE *.log
 
 # end