-savecheck: 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
- rm -f /tmp/coverage*
-
-# General regression testing of commands and output; look at the *.log and
-# corresponding *.chk files to see which tests this runs.
-regress:
- @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 "$<: $${legend}" "$${test}.chk")
+
+multifile-regress:
+ @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
+
+TEST_TARGETS = $(SGAMES) $(SCHECKS) $(RUN_TARGETS) multifile-regress
+
+tap: count $(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).
+#
+# 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.
+# 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 spurios 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.
+#
+TAPFILTER=tapview
+ancient: $(SGAMES)
+ @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; \
+ ./newfilter <$${stem}.chk | tapdiffer -w "$${stem}: $${legend}" $${stem}.ochk; \
+ fi; \