Improve test coverage.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index f7b6e2edbe37ebfec0040567f1660f478aba20f9..da0dc71f7ec4d13c7f890b432f04bde25971c38e 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -10,39 +10,39 @@ ECHO := /bin/echo
 
 all: regress
        @echo "=== No diff output is good news."
+       @-advent -x 2>/dev/null # Get usage message into coverage tests
 
 .SUFFIXES: .chk
 
 clean:
-       rm -fr *~ adventure.text adventure.data
+       rm -fr *~ adventure.text *.adv scratch.tmp
 
 # Show summary lines for all tests.
 testlist:
-       @grep --text '^##' *.log
+       @grep '^##' *.log
 listcheck:
        @for f in *.log; do \
-           if ( head -3 $$f | grep --text -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
+           if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
        done
 
 # General regression testing of commands and output; look at the *.log and
 # corresponding *.chk files to see which tests this runs.
-TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///')
-buildregress: adventure.data
+TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
+buildregress:
        @for file in $(TESTLOADS); do \
            echo "Remaking $${file}.chk"; \
-           advent <$${file}.log >$${file}.chk 2>&1 || exit 1; \
-       done
-regress: adventure.data
+           OPTS=`sed -n /#options:/s///p <$${file}.log`; \
+           advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
+       done; \
+       rm -f scratch.tmp
+regress:
        @for file in $(TESTLOADS); do \
-           $(ECHO) -n "  $${file} "; grep --text '##' $${file}.log  || echo ' ## (no description)'; \
-           if advent < $${file}.log >/tmp/regress$$$$ 2>&1; \
+           $(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 /tmp/regress$$$$
-
-adventure.data: 
-       cp "$(realpath ..)"/adventure.text .
-       timeout 1 advent >/dev/null 2>&1; true
+       done; \
+       rm -f scratch.tmp /tmp/regress$$$$
 
 # end