From 59a5afb72e4981ab370437c0f4b950f1d4424aa3 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 1 Apr 2023 16:58:52 -0400 Subject: [PATCH] Improve advent430 comparisons. --- tests/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 04f2da5..1593b69 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -134,7 +134,7 @@ 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 dpellings 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. @@ -146,8 +146,10 @@ count: # 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: $(SGAMES) @if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi @-(for x in *.log; do \ stem=$${x%.log}; \ @@ -156,10 +158,11 @@ 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 rm *-new advent430 adventure.data # end -- 2.31.1