savecheck only needs to be run for makiung coverage reports.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 7256b19ee4cecf1b85b5c89ab097ac98ac5adf38..aa7834f652e4cd44c050b5a05f6589e822bc61f6 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,14 +19,15 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 .PHONY: check coverage clean testlist listcheck savegames buildregress
 .PHONY: savecheck regress
 
-check: savecheck regress
+check: 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
 
 coverage: check
        lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
        genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
+       @-advent -x 2>/dev/null # Get usage message into coverage tests
+       @-advent -l /dev/null <pitfall.log >/dev/null
+       make savecheck
        ./coverage_dungeon.py
 
 .SUFFIXES: .chk
@@ -42,7 +43,18 @@ listcheck:
            if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
        done
 
-# Generate bogus savegames.
+# 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
+
+# Generate bogus savegames for coverage testing.
 savegames:
        @$(ECHO) "cheat: Generate save file with -900 deaths"
        @$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
@@ -58,17 +70,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; \
-       rm -f scratch.tmp
-
+# Force coverage of various edge cases
 savecheck: savegames
        @$(ECHO) "TEST cheat: Bogus option for save file generation"
        @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@@ -86,38 +88,32 @@ 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; \
-       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.
-
 # 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