-savecheck: savegames
- @$(ECHO) "TEST cheat: Bogus option for save file generation"
- @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
- @$(ECHO) "TEST cheat: No save file specified"
- @$(PARDIR)/cheat 2>/dev/null | true
- @$(ECHO) "TEST cheat: Fail to save because we omit -o"
- @$(PARDIR)/cheat -d 1 2> /tmp/coverage_cheat_nooutput | true
- @$(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
- @$(ECHO) "TEST advent: Start with invalid file with -l"
- @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 \
- done; \
- rm -f scratch.tmp /tmp/regress$$$$
+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 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