Revert Makefile changes that broke coverage testing for cheat.c

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index aa7834f652e4cd44c050b5a05f6589e822bc61f6..4acc93dffa75f30f9cbcca06ff58d5e537e23751 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,15 +19,14 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 .PHONY: check coverage clean testlist listcheck savegames buildregress
 .PHONY: savecheck regress
 
-check: tapcheck
+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
 
 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
@@ -43,18 +42,7 @@ listcheck:
            if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
        done
 
-# 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.
+# Generate bogus savegames.
 savegames:
        @$(ECHO) "cheat: Generate save file with -900 deaths"
        @$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
@@ -70,7 +58,18 @@ savegames:
        @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
        @rm -f /tmp/cheat*
 
-# Force coverage of various edge cases
+
+# 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
+
 savecheck: savegames
        @$(ECHO) "TEST cheat: Bogus option for save file generation"
        @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@@ -96,24 +95,22 @@ TAPCONSUMER=tapview
 # 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") >>$(FAILLOG)
+       $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
 
 multifile-regress:
-       @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk >>$(FAILLOG)
+       @(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)
+       @echo 1..$(words $(TEST_TARGETS))
 
 tapcheck:
-       @make --no-print-directory tap; tapview <$(FAILLOG)
+       @make tap | tapview
 
 # end