Test coverage of -s and -l options.

diff --git a/tests/Makefile b/tests/Makefile
index f1a37975d22b0081a5975f1a73fa976f47471269..88b18b49f76c095aee231afcac11a5f20f40d76c 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,7 +14,7 @@ all: regress
 .SUFFIXES: .chk
 
 clean:
-       rm -fr *~ adventure.text *.adv
+       rm -fr *~ adventure.text *.adv scratch.tmp
 
 # Show summary lines for all tests.
 testlist:
@@ -32,7 +32,8 @@ buildregress:
            echo "Remaking $${file}.chk"; \
            OPTS=`sed -n /#options:/s///p <$${file}.log`; \
            advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
-       done
+       done; \
+       rm -f scratch.tmp
 regress:
        @for file in $(TESTLOADS); do \
            $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
@@ -41,6 +42,6 @@ regress:
            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$$$$
+       rm -f scratch.tmp /tmp/regress$$$$
 
 # end

diff --git a/tests/logopt.chk b/tests/logopt.chk
new file mode 100644 (file)
index 0000000..1ed3c78
--- /dev/null
+++ b/tests/logopt.chk
@@ -0,0 +1,26 @@
+
+Welcome to Adventure!!  Would you like instructions?
+
+> > > 
+You are standing at the end of a road before a small brick building.
+Around you is a forest.  A small stream flows out of the building and
+down a gully.
+
+> 
+You are inside a building, a well house for a large spring.
+
+There are some keys on the ground here.
+
+There is a shiny brass lamp nearby.
+
+There is food here.
+
+There is a bottle of water here.
+
+> 
+> 
+You scored 32 out of a possible 430, using 1 turn.
+
+You are obviously a rank amateur.  Better luck next time.
+
+To achieve the next higher rating, you need 14 more points.

diff --git a/tests/logopt.log b/tests/logopt.log
new file mode 100644 (file)
index 0000000..204f8a3
--- /dev/null
+++ b/tests/logopt.log
@@ -0,0 +1,5 @@
+## Exercise logging option and seed dump
+#options: -s -l scratch.tmp
+n
+in
+