Improve test coverage.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 4ab1b4cee1b859dd65536eddb82e802c60715bd9..88b18b49f76c095aee231afcac11a5f20f40d76c 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,8 +1,5 @@
 # Test-suite makefile for reposurgeon
 
-# By setting the REPOSURGEON environment variable and using -e
-# a different implementation can be plugged in to the tests.
-
 # Use absolute path so tests that change working directory still use 
 # scripts from parent directory.  Note that using $PWD seems to fail
 # here under Gitlab's CI environment.
@@ -17,35 +14,34 @@ all: regress
 .SUFFIXES: .chk
 
 clean:
-       rm -fr *~ adventure.text adventure.data
+       rm -fr *~ adventure.text *.adv scratch.tmp
 
 # Show summary lines for all tests.
 testlist:
-       @grep --text '^##' *.log
+       @grep '^##' *.log
 listcheck:
        @for f in *.log; do \
-           if ( head -3 $$f | grep --text -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
+           if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
        done
 
 # 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///')
-buildregress: adventure.data
+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
-regress: adventure.data
+           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 --text '##' $${file}.log  || echo ' ## (no description)'; \
-           if advent < $${file}.log >/tmp/regress$$$$ 2>&1; \
+           $(ECHO) -n "  $${file} "; grep '##' $${file}.log  || echo ' ## (no description)'; \
+           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$$$$
-
-adventure.data: 
-       cp "$(realpath ..)"/adventure.text .
-       timeout 1 advent >/dev/null 2>&1; true
+       done; \
+       rm -f scratch.tmp /tmp/regress$$$$
 
 # end