Update maxhinert for tap from reposurgeon...

[open-adventure.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 4d7f21518262bc911ac7cc22cc165ac235c1889d..919a701d5d573c8274d3033b28e72d5243cd6c3e 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-# Test-suite makefile for reposurgeon
+# Test-suite makefile for opeb-adventure
 
 # Use absolute path so tests that change working directory still use
 # scripts from parent directory.  Note that using $PWD seems to fail
@@ -25,7 +25,6 @@ check: savecheck regress
        @-advent -l /dev/null <pitfall.log >/dev/null
 
 coverage: check
-       ls -lR $(PARDIR)
        lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
        genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
        ./coverage_dungeon.py
@@ -68,6 +67,7 @@ buildregress: 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
        rm -f scratch.tmp
 
 savecheck: savegames
@@ -97,6 +97,55 @@ regress:
            then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \
            else echo "*** Nonzero return status on $${file}!"; exit 1; fi \
        done; \
+       $(ECHO) "  multifile ## Test multiple file arguments"
+       @(echo "inven" | advent isofoo.log /dev/stdin | diff --text -u multifile.chk -) || exit 1
        rm -f scratch.tmp /tmp/regress$$$$
 
+# Steps towards TAP and parallelization.
+# There's a blocker in that the log tests can't be run concurrently
+# due to issues with colliding save files.
+
+# See https://stackoverflow.com/questions/6481005/how-to-obtain-the-number-of-cpus-cores-in-linux-from-the-command-line
+CONCURRENT_JOBS=$(shell getconf _NPROCESSORS_ONLN || getconf NPROCESSORS_ONLN || echo 4)
+
+# The TAP filter. Only affects presentation of the test suite messages
+TAPCONSUMER=tapview
+
+# Fall back to safety if our declared TAP consumer does not exist.
+# This is helpful in the CI environment, where it would be better for
+# the logfiles to carry the raw TAP messages. 
+TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
+
+# Run specified tests in parallel and ship their output to our TAP consumer after a plan header
+TAPOUT = (echo "1..$(words $(1))"; $(MAKE) --output-sync --no-print-directory -j $(CONCURRENT_JOBS) $(1)) | $(TAPFILTER)
+
+# Parallel make doesn't return a fail status when a single subprocess fails,
+# so we need to log the failures and check the log for nonemptiness in order
+# to hand a real status back. This is important for CI/CD.  
+FAILLOG=/tmp/reposurgeon-make.log
+
+TEST_TARGETS=$(TESTLOADS:%=run-regress-%)
+$(TEST_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") >>$(FAILLOG);
+
+# parallel-tap must not be run in parallel.
+parallel-check:
+       @$(MAKE) -j1 --no-print-directory parallel-tap
+
+# This is the normal way to run the tests interactively,
+# using a TAP consumer.
+parallel-tap: clean disclose
+       @rm -f $(FAILLOG)
+       @$(call TAPOUT,$(TEST_TARGETS)); if [ -s $(FAILLOG) ]; then ( echo "Tests failed:"; cat $(FAILLOG); exit 1); fi; 
+
+disclose:
+       @echo "Running with $(CONCURRENT_JOBS) threads."
+
+tap: savecheck count $(TEST_TARGETS)
+       @echo "# Tests complete"
+count:
+       @echo 1..$(words $(TEST_TARGETS))
+
 # end