Fix handling of intransitive "say".

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 16a1d54e3b238a55b37e3f68de8a821be64779c8..f1a37975d22b0081a5975f1a73fa976f47471269 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,7 +14,7 @@ all: regress
 .SUFFIXES: .chk
 
 clean:
-       rm -fr *~ adventure.text
+       rm -fr *~ adventure.text *.adv
 
 # Show summary lines for all tests.
 testlist:
@@ -26,7 +26,7 @@ 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///')
+TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 buildregress:
        @for file in $(TESTLOADS); do \
            echo "Remaking $${file}.chk"; \
@@ -40,7 +40,7 @@ regress:
            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$$$$
+       done; \
+       rm -f /tmp/regress$$$$
 
 # end