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

diff --git a/tests/Makefile b/tests/Makefile
index fd802f6..74332dc 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,23 +8,20 @@ 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
 
 # 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
@@ -36,13 +30,12 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///')
 buildregress:
 	@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:
 	@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)'; \
+	    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