Improve test coverage.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 74332dccada60e4d8e8093f629ba5d48297fb5fe..88b18b49f76c095aee231afcac11a5f20f40d76c 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,7 +14,7 @@ all: regress
 .SUFFIXES: .chk
 
 clean:
-       rm -fr *~ adventure.text
+       rm -fr *~ adventure.text *.adv scratch.tmp
 
 # Show summary lines for all tests.
 testlist:
@@ -26,19 +26,22 @@ listcheck:
 
 # 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///')
+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
+           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 '##' $${file}.log  || echo ' ## (no description)'; \
-           if advent < $${file}.log >/tmp/regress$$$$ 2>&1; \
+           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$$$$
+       done; \
+       rm -f scratch.tmp /tmp/regress$$$$
 
 # end