How to set up prerequisites for oldcompare

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 80768024cf6febf4b51e921063040304e74f5e8d..122e94ab590dc59108bbbe5ebd10594f4d59484b 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,8 @@
 # Test-suite makefile for open-adventure
 
+# SPDX-FileCopyrightText: Eric S. Raymond <esr@thyrsus.com>
+# SPDX-License-Identifier: BSD-2-Clause
+
 # Use absolute path so tests that change working directory still use
 # scripts from parent directory.  Note that using $PWD seems to fail
 # here under Gitlab's CI environment.
@@ -108,17 +111,17 @@ 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 issue36.log /dev/stdin >multifile.chk; \
        rm -f scratch.tmp
 
 RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
 $(RUN_TARGETS): run-regress-%: %.log
        @(test=$(<:.log=); legend=$$(sed -n '/^## /s///p' <"$<" 2>/dev/null || echo "(no description)"); \
        OPTS=`sed -n /#options:/s///p $<`; \
-       $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
+       $(advent) $$OPTS <$< | tapdiffer "$${test}: $${legend}" "$${test}.chk")
 
 multifile-regress:
-       @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
+       @(echo "inven" | advent issue36.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
 
 TEST_TARGETS = $(SGAMES) $(SCHECKS) $(RUN_TARGETS) multifile-regress
 
@@ -133,6 +136,14 @@ count:
 # master leaving advent430 and adventure.data in place (make clean
 # does not remove them).
 #
+# make clean                 # Clean up object files, laving a bare source tree
+# git checkout advent430     # Check out the advent430 branch
+# make                       # Build the advent430 binary
+# advent430                  # Run it.  Answer the novice question and quit
+# make clean                 # Remove .o files
+# git checkout master        # Go back to master branch
+# make                       # Rebuild advent.
+#
 # 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
@@ -159,7 +170,7 @@ oldcompare:
                        else \
                                ./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \
                                ../advent <$${stem}.log >$${stem}.log-new; \
-                               ./newfilter <$${stem}.log-new | tapdiffer -w "$${stem}: $${legend}" $${stem}.ochk; \
+                               ./newfilter <$${stem}.log-new | tapdiffer -b "$${stem}: $${legend}" $${stem}.ochk; \
                        fi; \
        done; \
        echo 1..$(words $(shell ls *.log))) | $(TAPFILTER)