X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=d188e7074d119afbc64dfd0b9707f160c26e584f;hb=23e9931645f7c2923ea842164a7797c7e46fb5b8;hp=919a701d5d573c8274d3033b28e72d5243cd6c3e;hpb=c78845e05a2040d260fa63f891fbb52f8f3ce575;p=open-adventure.git diff --git a/tests/Makefile b/tests/Makefile index 919a701..d188e70 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -13,22 +13,26 @@ advent?=advent # Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n ECHO := /bin/echo +# 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) + # Find all *.log entries to test TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort) -.PHONY: check coverage clean testlist listcheck savegames buildregress -.PHONY: savecheck regress +.PHONY: check clean testlist listcheck savegames savecheck coverage +.PHONY: buildchecks multifile-regress tap count -check: savecheck regress +check: savecheck + @make tap | tapview @echo "=== No diff output is good news." - @-advent -x 2>/dev/null # Get usage message into coverage tests + @-advent -x 2>/dev/null || exit 0 # Get usage message into coverage tests @-advent -l /dev/null /dev/null -coverage: check - lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV) - genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info - ./coverage_dungeon.py - .SUFFIXES: .chk clean: @@ -58,18 +62,7 @@ savegames: @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp @rm -f /tmp/cheat* - -# Rebuild characterizing tests -buildregress: savegames - $(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves - @for file in $(TESTLOADS); do \ - echo "Remaking $${file}.chk"; \ - 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 - +# Force coverage of cheat edgecases savecheck: savegames @$(ECHO) "TEST cheat: Bogus option for save file generation" @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true @@ -87,64 +80,34 @@ savecheck: savegames @advent -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1 @rm -f /tmp/coverage* -# General regression testing of commands and output; look at the *.log and -# corresponding *.chk files to see which tests this runs. -regress: +coverage: check + lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV) + genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info + ./coverage_dungeon.py + +# Rebuild characterizing tests +buildchecks: savegames + $(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves @for file in $(TESTLOADS); do \ - $(ECHO) -n " $${file} "; grep '##' $${file}.log || echo ' ## (no description)'; \ + echo "Remaking $${file}.chk"; \ OPTS=`sed -n /#options:/s///p <$${file}.log`; \ - if $(advent) $$OPTS < $${file}.log >/tmp/regress$$$$ 2>&1; \ - then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \ - else echo "*** Nonzero return status on $${file}!"; exit 1; fi \ + advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \ 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 + echo "inven" | advent isofoo.log /dev/stdin >multifile.chk + rm -f scratch.tmp -TEST_TARGETS=$(TESTLOADS:%=run-regress-%) -$(TEST_TARGETS): run-regress-%: %.log +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") >>$(FAILLOG); - -# parallel-tap must not be run in parallel. -parallel-check: - @$(MAKE) -j1 --no-print-directory parallel-tap + $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk") -# 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; +multifile-regress: + @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk -disclose: - @echo "Running with $(CONCURRENT_JOBS) threads." +TEST_TARGETS = $(RUN_TARGETS) multifile-regress -tap: savecheck count $(TEST_TARGETS) - @echo "# Tests complete" +tap: count $(TEST_TARGETS) count: @echo 1..$(words $(TEST_TARGETS))