Make it possible to pass options to advent from within regression-test loads.

diff --git a/tests/Makefile b/tests/Makefile
index 74332dccada60e4d8e8093f629ba5d48297fb5fe..16a1d54e3b238a55b37e3f68de8a821be64779c8 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -30,12 +30,14 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///')
 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

diff --git a/tests/oldstyle.log b/tests/oldstyle.log
new file mode 100644 (file)
index 0000000..ae6f7fe
--- /dev/null
+++ b/tests/oldstyle.log
@@ -0,0 +1,5 @@
+## Simple quit
+#options: -o
+n
+quit
+yes