X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=cffab9a73391d093f3beb58bff8319936b1e45e4;hb=73f383129491e36632391b8d7905a7eb9969f4d5;hp=74332dccada60e4d8e8093f629ba5d48297fb5fe;hpb=900f8d9df50daba2f678c43f9c85ca8e19900090;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index 74332dc..cffab9a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,13 +8,15 @@ PATH := $(realpath ..):$(realpath .):${PATH}
 # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
 ECHO := /bin/echo
 
-all: regress
+check: regress
 	@echo "=== No diff output is good news."
+	@-advent -x 2>/dev/null	# Get usage message into coverage tests
+	@-advent -l /dev/null <quit.log >/dev/null
 
 .SUFFIXES: .chk
 
 clean:
-	rm -fr *~ adventure.text
+	rm -fr *~ adventure.text *.adv scratch.tmp
 
 # Show summary lines for all tests.
 testlist:
@@ -26,19 +28,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