-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 / | true
- @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; \
- then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \
- else echo "*** Nonzero return status on $${file}!"; exit 1; fi \
+
+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 "$${test}: $${legend}" "$${test}.chk")
+
+multifile-regress:
+ @(echo "inven" | advent issue36.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
+
+TEST_TARGETS = $(SCHECKS) $(RUN_TARGETS) multifile-regress
+
+tap: count $(SGAMES) $(TEST_TARGETS)
+ @rm -f scratch.tmp /tmp/coverage* /tmp/cheat*
+count:
+ @echo 1..$(words $(TEST_TARGETS))
+
+# The following machinery tests the game against a binary made from
+# the advent430 branch To use it, switch to that branch, build the
+# 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 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.
+# 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 with the LCG chain.
+#
+# The *.chk files need not be up-to-date for this to work.
+#
+TAPFILTER=tapview
+oldcompare:
+ @if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi
+ @-(for x in *.log; do \
+ stem=$${x%.log}; \
+ legend=$$(sed -n '/^## /s///p' <$$x 2>/dev/null || echo "(no description)"); \
+ if grep NOCOMPARE $$x >/dev/null; \
+ then echo "not ok - $${stem}.ochk: $${legend} # SKIP"; \
+ else \
+ ./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \
+ ../advent <$${stem}.log >$${stem}.log-new; \
+ ./newfilter <$${stem}.log-new | tapdiffer -b "$${stem}: $${legend}" $${stem}.ochk; \
+ fi; \