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

diff --git a/tests/Makefile b/tests/Makefile
index 8d61d27..7087e69 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-# Test-suite makefile for opeb-adventure
+# Test-suite makefile for open-adventure
 
 # Use absolute path so tests that change working directory still use
 # scripts from parent directory.  Note that using $PWD seems to fail
@@ -92,6 +92,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
@@ -124,20 +127,29 @@ tap: count $(TEST_TARGETS)
 count:
 	@echo 1..$(words $(TEST_TARGETS))
 
-# The following machinery tests the gane against a binary made from
+# 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).
 #
 # 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: $(SGAMES)
 	@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 +158,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 -w "$${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