X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=da0dc71f7ec4d13c7f890b432f04bde25971c38e;hb=c2df849dade5bb7d8214c6abb6c0856b84d0d1d1;hp=d200888d70c9aad6fe2b5ac80fc4e886a9228c7d;hpb=708d728bb502ab1b97fb798203352484945e152c;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index d200888..da0dc71 100644
--- 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.
@@ -11,44 +8,41 @@ PATH := $(realpath ..):$(realpath .):${PATH}
 # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
 ECHO := /bin/echo
 
-default:
-	make -e --quiet all
-
-all: listcheck regress
+all: regress
 	@echo "=== No diff output is good news."
+	@-advent -x 2>/dev/null	# Get usage message into coverage tests
 
 .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