Fixed automated testing

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index f7b6e2edbe37ebfec0040567f1660f478aba20f9..d2ccb148f4f2f22ba640e2be1fd5b63f6ebc592a 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,41 +8,68 @@ PATH := $(realpath ..):$(realpath .):${PATH}
 # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
 ECHO := /bin/echo
 
-all: regress
+check: regress
        @echo "=== No diff output is good news."
+       @-advent -x 2>/dev/null # Get usage message into coverage tests
+       @-advent -l /dev/null <pitfall.log >/dev/null
+
+coverage: check
+       lcov -t "advent" -o ../advent.info -c -d ..
+       genhtml -o ../coverage/ ../advent.info
 
 .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
 
+savegames:
+       $(ECHO) "cheat: Generate save file with -1000 deaths"
+       ../cheat -d -1000 -o cheat_numdie.adv > /tmp/cheat_numdie
+       $(ECHO) "cheat: Generate save file with version -1337"
+       ../cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
+       $(ECHO) "cheat: Generate save file 1000 saves"
+       ../cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
+       rm -f /tmp/cheat*
+
 # 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: savegames
+       ../cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves
        @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: savegames
+       $(ECHO) "TEST cheat: Bogus option for save file generation"
+       ../cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
+       $(ECHO) "TEST cheat: Fail to save because we omit -o"
+       ../cheat -d 1 2> /tmp/coverage_cheat_nooutput | true
+       $(ECHO) "TEST cheat: Fail to save to invalid path"
+       ../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
+       $(ECHO) "TEST advent: Start with invalid file with -r"
+       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
        @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$$$$ /tmp/coverage*
 
 # end