X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=f7b6e2edbe37ebfec0040567f1660f478aba20f9;hb=e0f160d3131c8cffae99fb8e721c555d352a92a4;hp=fd802f60fc9301081b0ebf364ffcb4eeb6b175d6;hpb=894724d1c844f769a4a7a67047adf82bcbd8ad75;p=open-adventure.git

diff --git a/tests/Makefile b/tests/Makefile
index fd802f6..f7b6e2e 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,16 +8,13 @@ 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."
 
 .SUFFIXES: .chk
 
 clean:
-	rm -fr *~
+	rm -fr *~ adventure.text adventure.data
 
 # Show summary lines for all tests.
 testlist:
@@ -33,19 +27,22 @@ 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///')
-buildregress:
+buildregress: adventure.data
 	@for file in $(TESTLOADS); do \
 	    echo "Remaking $${file}.chk"; \
-	    $(REPOSURGEON) advent <$${file}.log >$${file}.chk \
-		2>&1 || exit 1; \
+	    advent <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done
-regress:
+regress: adventure.data
 	@for file in $(TESTLOADS); do \
 	    $(ECHO) -n "  $${file} "; grep --text '##' $${file}.log  || echo ' ## (no description)'; \
-	    if advent $${file}.log >/tmp/regress$$$$ 2>&1; \
+	    if advent < $${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
+
 # end