archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Integrate multifile test into TAP sequence.

Browse source
This commit is contained in:
Eric S. Raymond 2022-04-13 02:58:02 -04:00
parent 7b3b5d32c0
commit 129136b51e
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/Makefile
View file

@ -101,7 +101,7 @@ regress:
@(echo "inven" | advent isofoo.log /dev/stdin | diff --text -u multifile.chk -) || exit 1 @(echo "inven" | advent isofoo.log /dev/stdin | diff --text -u multifile.chk -) || exit 1
rm -f scratch.tmp /tmp/regress$$$$ rm -f scratch.tmp /tmp/regress$$$$
# Steps towards TAP. savecheck and the isofoo test are not yet integrated. # Steps towards TAP. savecheck is not yet integrated.
# The TAP filter. Only affects presentation of the test suite messages # The TAP filter. Only affects presentation of the test suite messages
TAPCONSUMER=tapview TAPCONSUMER=tapview
@ -111,17 +111,19 @@ TAPCONSUMER=tapview
# the logfiles to carry the raw TAP messages. # the logfiles to carry the raw TAP messages.
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat) TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
# Parallel make doesn't return a fail status when a single subprocess fails,
# so we need to log the failures and check the log for nonemptiness in order
# to hand a real status back. This is important for CI/CD.
FAILLOG=/tmp/advent-test.log FAILLOG=/tmp/advent-test.log
TEST_TARGETS=$(TESTLOADS:%=run-regress-%) RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
$(TEST_TARGETS): run-regress-%: %.log $(RUN_TARGETS): run-regress-%: %.log
@(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \ @(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \
OPTS=`sed -n /#options:/s///p $<`; \ OPTS=`sed -n /#options:/s///p $<`; \
$(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk") >>$(FAILLOG) $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk") >>$(FAILLOG)
multifile-regress:
@(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk >>$(FAILLOG)
TEST_TARGETS = $(RUN_TARGETS) multifile-regress
tap: count $(TEST_TARGETS) tap: count $(TEST_TARGETS)
count: count:
@echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG) @echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG)