Cleann up scratchfile after tesrs.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 59f29721d84eec127bbbdd9f6bae6ad0480ec4a9..fb03fdbe5317ea85335b983f24bdde43ae859f52 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -30,7 +30,7 @@ TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
 check: savecheck
        @make tap | tapview
        @echo "=== No diff output is good news."
-       @-advent -x 2>/dev/null # Get usage message into coverage tests
+       @-advent -x 2>/dev/null || exit 0 # Get usage message into coverage tests
        @-advent -l /dev/null <pitfall.log >/dev/null
 
 .SUFFIXES: .chk
@@ -73,11 +73,11 @@ savecheck: savegames
        @$(ECHO) "TEST cheat: Fail to save to invalid path"
        @$(PARDIR)/cheat -o / 2> /tmp/coverage_cheat_badoutput | true
        @$(ECHO) "TEST advent: Start with invalid file with -r"
-       @advent -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
+       @$(advent) -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
        @$(ECHO) "TEST advent: Start with invalid file with -l"
-       @advent -l / < pitfall.log > /tmp/coverage_advent_logfail 2>&1 || exit 1
+       @$(advent) -l / < pitfall.log > /tmp/coverage_advent_logfail 2>&1 || exit 1
        @$(ECHO) "TEST advent: Test -r with valid input"
-       @advent -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
+       @$(advent) -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
        @rm -f /tmp/coverage*
 
 coverage: check
@@ -93,7 +93,7 @@ buildchecks: savegames
            OPTS=`sed -n /#options:/s///p <$${file}.log`; \
            advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
        done; \
-       echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
+       echo "inven" | advent isofoo.log /dev/stdin >multifile.chk; \
        rm -f scratch.tmp
 
 RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
@@ -108,6 +108,7 @@ multifile-regress:
 TEST_TARGETS = $(RUN_TARGETS) multifile-regress
 
 tap: count $(TEST_TARGETS)
+       rm -f scratch.tmp
 count:
        @echo 1..$(words $(TEST_TARGETS))