Improve TAP messages slightly.

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 7087e69dd530be54d5a869a09bfa50d2ecd7f958..efa5332eef220f9ef7d16806f25eb03f7c28d761 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
 
@@ -149,7 +152,7 @@ count:
 # The *.chk files need not be up-to-date for this to work.
 #
 TAPFILTER=tapview
-oldcompare: $(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}; \
@@ -159,7 +162,7 @@ oldcompare: $(SGAMES)
                        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)