X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=80768024cf6febf4b51e921063040304e74f5e8d;hb=9c6219a27d7967c4eea64702c9c0366c420c8e4c;hp=59f29721d84eec127bbbdd9f6bae6ad0480ec4a9;hpb=44017d64bb811868e71172af3daa84a1cf7a4012;p=open-adventure.git diff --git a/tests/Makefile b/tests/Makefile index 59f2972..8076802 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -# Test-suite makefile for opeb-adventure +# Test-suite makefile for open-adventure # Use absolute path so tests that change working directory still use # scripts from parent directory. Note that using $PWD seems to fail @@ -29,14 +29,12 @@ 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 -l /dev/null /dev/null + @-advent -x 2>/dev/null || exit 0 # Get usage message into coverage tests .SUFFIXES: .chk clean: - rm -fr *~ adventure.text *.adv scratch.tmp + rm -fr *~ *.adv scratch.tmp *.ochk advent430 adventure.data # Show summary lines for all tests. testlist: @@ -47,39 +45,56 @@ listcheck: done # Generate bogus savegames. -savegames: - @$(ECHO) "cheat: Generate save file with -900 deaths" +sgame1: @$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie - @$(ECHO) "cheat: Generate save file with -1000 deaths" + @./outcheck.sh "cheat: Generate save file with -900 deaths" +sgame2: @$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000 - @$(ECHO) "cheat: Generate save file with version -1337" + @./outcheck.sh "cheat: Generate save file with -1000 deaths" +sgame3: + @$(PARDIR)/cheat -d 2000 -o cheat_savetamper.adv > /tmp/cheat_savetamper + @./outcheck.sh "cheat: Generate tamper-detection test" +sgame4: @$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion - @$(ECHO) "cheat: Generate save file 1000 saves" + @./outcheck.sh "cheat: Generate save file with version -1337" +sgame5: @$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves - @$(ECHO) "cheat: Generate save file 1000 turns" + @./outcheck.sh "cheat: Generate save file 1000 saves" +sgame6: @$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns - @$(ECHO) "cheat: Generate save file 1000 turns" + @./outcheck.sh "cheat: Generate save file 1000 turns" +sgame7: @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp - @rm -f /tmp/cheat* + @./outcheck.sh "cheat: Generate save file 1000 turns" +SGAMES = sgame1 sgame2 sgame3 sgame4 sgame5 sgame6 sgame7 # Force coverage of cheat edgecases -savecheck: savegames - @$(ECHO) "TEST cheat: Bogus option for save file generation" +scheck1: @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true - @$(ECHO) "TEST cheat: No save file specified" + @./outcheck.sh "cheat: bogus option for save file generation" +scheck2: @$(PARDIR)/cheat 2>/dev/null | true - @$(ECHO) "TEST cheat: Fail to save because we omit -o" + @./outcheck.sh "cheat: No save file specified" +scheck3: @$(PARDIR)/cheat -d 1 2> /tmp/coverage_cheat_nooutput | true - @$(ECHO) "TEST cheat: Fail to save to invalid path" + @./outcheck.sh "cheat: doesn't save because we omit -o" +scheck4: @$(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 - @$(ECHO) "TEST advent: Start with invalid file with -l" - @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 - @rm -f /tmp/coverage* - + @./outcheck.sh "cheat: doesn't save to invalid path" +scheck5: + @$(advent) -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1 + @./outcheck.sh "cheat: doesn't start with invalid file with -r" +scheck6: + @$(advent) -l / < pitfall.log > /tmp/coverage_advent_logfail 2>&1 || exit 1 + @./outcheck.sh "cheat: doesn't start with invalid file passed to -l" +scheck7: + @$(advent) -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1 + @./outcheck.sh "test -r with valid input" +SCHECKS = scheck1 scheck2 scheck3 scheck4 scheck5 scheck6 scheck7 + +# Don't run this from here, you'll get cryptic warnings and no good result +# if the advent binary wasn't built with coverage flags. Do "make clean coverage" +# from the top-level directory. coverage: check lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV) genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info @@ -93,7 +108,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-%) @@ -105,10 +120,53 @@ $(RUN_TARGETS): run-regress-%: %.log multifile-regress: @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk -TEST_TARGETS = $(RUN_TARGETS) multifile-regress +TEST_TARGETS = $(SGAMES) $(SCHECKS) $(RUN_TARGETS) multifile-regress tap: count $(TEST_TARGETS) + @rm -f scratch.tmp /tmp/coverage* /tmp/cheat* count: @echo 1..$(words $(TEST_TARGETS)) +# The following machinery tests the game against a binary made from +# the advent430 branch To use it, switch to that branch, build the +# binary, run it once to generate adventure.data, then switch back to +# master leaving advent430 and adventure.data in place (make clean +# does not remove them). +# +# The diff file produced has corrected spellings in it. That's what oldfilter +# is for, to massage out the original spellings and avoid noise diffs. +# Diffs in amount of whitespace and trailing whitespace are ignored +# +# A magic comment of NOCOMPARE in a log file excludes it from this comparison. +# making it a skipped test in the TAP view. First use of this was to avoid a +# spurious mismatch on the news text. Other uses avoid spurious mismatches due +# to bug fixes. +# +# When adding more tests, bear in mind that any game that continues after a +# resurrection will need a NOCOMPARE. At some point in the forward port, +# resurrection was accidentally changed in a way that messed wil the LCG chain. +# +# The *.chk files need not be up-to-date for this to work. +# +TAPFILTER=tapview +oldcompare: + @if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi + @-(for x in *.log; do \ + stem=$${x%.log}; \ + legend=$$(sed -n '/^## /s///p' <$$x 2>/dev/null || echo "(no description)"); \ + if grep NOCOMPARE $$x >/dev/null; \ + then echo "not ok - $${stem}.ochk: $${legend} # SKIP"; \ + else \ + ./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \ + ../advent <$${stem}.log >$${stem}.log-new; \ + ./newfilter <$${stem}.log-new | tapdiffer -w "$${stem}: $${legend}" $${stem}.ochk; \ + fi; \ + done; \ + echo 1..$(words $(shell ls *.log))) | $(TAPFILTER) + @rm *.ochk *-new advent430 adventure.data + +# List all NOMPARE tests. +residuals: + @grep -n NOCOMPARE *.log + # end