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
rm -f scratch.tmp
savecheck: savegames
then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \
else echo "*** Nonzero return status on $${file}!"; exit 1; fi \
done; \
+ $(ECHO) " multifile ## Test multiple file arguments"
+ @(echo "inven" | advent isofoo.log /dev/stdin | diff --text -u multifile.chk -) || exit 1
rm -f scratch.tmp /tmp/regress$$$$
-# Steps towards TAP and parallelization.
-# There's a blocker in that the log tests can't be run concurrently
-# due to isssues with colliding save files.
+# Steps towards TAP. savecheck is not yet integrated.
# The TAP filter. Only affects presentation of the test suite messages
-TAPCONSUMER=tappy
+TAPCONSUMER=tapview
# Fall back to safety if our declared TAP consumer does not exist.
-# This is helpful in the CI environment, where it wiuld be better for
+# This is helpful in the CI environment, where it would be better for
# the logfiles to carry the raw TAP messages.
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
+FAILLOG=/tmp/advent-test.log
+
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 "$<: $${legend}" "$${test}.chk") >>$(FAILLOG)
+
+multifile-regress:
+ @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk >>$(FAILLOG)
-tap: savecheck count $(RUN_TARGETS)
+TEST_TARGETS = $(RUN_TARGETS) multifile-regress
+
+tap: count $(TEST_TARGETS)
count:
- @echo 1..$(words $(RUN_TARGETS))
+ @echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG)
+
+tapcheck:
+ @make --no-print-directory tap; tapview <$(FAILLOG)
# end