Switch normal regression testing to TAP output.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 498dbb80a4293e1ffb0c9a604e9b14f5a2103742..b3cc2c35e33f78607c783cd5215a55d76b6131fa 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,7 +19,7 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 .PHONY: check coverage clean testlist listcheck savegames buildregress
 .PHONY: savecheck regress
 
-check: savecheck regress
+check: savecheck tapcheck
        @echo "=== No diff output is good news."
        @-advent -x 2>/dev/null # Get usage message into coverage tests
        @-advent -l /dev/null <pitfall.log >/dev/null
@@ -87,22 +87,6 @@ savecheck: savegames
        @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; \
-       $(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. savecheck and the isofoo test are not yet integrated.
-
 # The TAP filter. Only affects presentation of the test suite messages
 TAPCONSUMER=tapview
 
@@ -111,17 +95,19 @@ TAPCONSUMER=tapview
 # the logfiles to carry the raw TAP messages. 
 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
 
-TEST_TARGETS=$(TESTLOADS:%=run-regress-%)
-$(TEST_TARGETS): run-regress-%: %.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") >>$(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)
 count:
        @echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG)