X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=80768024cf6febf4b51e921063040304e74f5e8d;hb=9c6219a27d7967c4eea64702c9c0366c420c8e4c;hp=8cf9e7e30f0261c0fcf560fdde0d1ef476248ce2;hpb=a5eeb0b2bc62d70902d3c44b077a5ddec6361b44;p=open-adventure.git diff --git a/tests/Makefile b/tests/Makefile index 8cf9e7e..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 @@ -92,8 +92,8 @@ scheck7: @./outcheck.sh "test -r with valid input" SCHECKS = scheck1 scheck2 scheck3 scheck4 scheck5 scheck6 scheck7 -# Don't run this from here, you'll get ctyptic warnings and no good result -# if the advent binary wasn't built with covrage flags. Do "make clean covetage" +# 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) @@ -134,15 +134,22 @@ count: # does not remove them). # # The diff file produced has corrected spellings in it. That's what oldfilter -# is for, to massage out the orioginal dpellings and avoid noise diffs. +# 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 spurios mismatches due +# 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 -ancient: $(SGAMES) +oldcompare: @if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi @-(for x in *.log; do \ stem=$${x%.log}; \ @@ -151,10 +158,15 @@ ancient: $(SGAMES) then echo "not ok - $${stem}.ochk: $${legend} # SKIP"; \ else \ ./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \ - ./newfilter <$${stem}.chk | tapdiffer -w "$${stem}: $${legend}" $${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 advent430 adventure.data + @rm *.ochk *-new advent430 adventure.data + +# List all NOMPARE tests. +residuals: + @grep -n NOCOMPARE *.log # end