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

diff --git a/tests/Makefile b/tests/Makefile
index 74332dc..81aa23b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -26,16 +26,18 @@ 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; \
+	    OPTS=`sed -n /#options:/s///p <$${file}.log`; \
+	    advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done
 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