Prevent spurious error return.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 498dbb80a4293e1ffb0c9a604e9b14f5a2103742..d188e7074d119afbc64dfd0b9707f160c26e584f 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -13,22 +13,26 @@ advent?=advent
 # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
 ECHO := /bin/echo
 
+# The TAP filter. Only affects presentation of the test suite messages
+TAPCONSUMER=tapview
+
+# Fall back to safety if our declared TAP consumer does not exist.
+# 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)
+
 # Find all *.log entries to test
 TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 
-.PHONY: check coverage clean testlist listcheck savegames buildregress
-.PHONY: savecheck regress
+.PHONY: check clean testlist listcheck savegames savecheck coverage
+.PHONY: buildchecks multifile-regress tap count
 
-check: savecheck regress
+check: savecheck
+       @make tap | tapview
        @echo "=== No diff output is good news."
-       @-advent -x 2>/dev/null # Get usage message into coverage tests
+       @-advent -x 2>/dev/null || exit 0 # Get usage message into coverage tests
        @-advent -l /dev/null <pitfall.log >/dev/null
 
-coverage: check
-       lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
-       genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
-       ./coverage_dungeon.py
-
 .SUFFIXES: .chk
 
 clean:
@@ -58,18 +62,7 @@ savegames:
        @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
        @rm -f /tmp/cheat*
 
-
-# Rebuild characterizing tests
-buildregress: savegames
-       $(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
-       @for file in $(TESTLOADS); do \
-           echo "Remaking $${file}.chk"; \
-           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
-
+# Force coverage of cheat edgecases
 savecheck: savegames
        @$(ECHO) "TEST cheat: Bogus option for save file generation"
        @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@@ -87,46 +80,35 @@ 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:
+coverage: check
+       lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
+       genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
+       ./coverage_dungeon.py
+
+# Rebuild characterizing tests
+buildchecks: savegames
+       $(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
        @for file in $(TESTLOADS); do \
-           $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
+           echo "Remaking $${file}.chk"; \
            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 \
+           advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
        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
-
-# Fall back to safety if our declared TAP consumer does not exist.
-# 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)
-
-# 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
+       echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
+       rm -f scratch.tmp
 
-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)
+       $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
+
+multifile-regress:
+       @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
+
+TEST_TARGETS = $(RUN_TARGETS) multifile-regress
 
 tap: count $(TEST_TARGETS)
 count:
-       @echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG)
-
-tapcheck:
-       @make --no-print-directory tap; tapview <$(FAILLOG)
+       @echo 1..$(words $(TEST_TARGETS))
 
 # end