X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2FMakefile;h=919a701d5d573c8274d3033b28e72d5243cd6c3e;hb=c78845e05a2040d260fa63f891fbb52f8f3ce575;hp=c93f6bbeb49d190b2b0f1ba36d38d0fbf4909463;hpb=bd1b89326363092f568d80c3959feb7ed9cd7cb9;p=open-adventure.git diff --git a/tests/Makefile b/tests/Makefile index c93f6bb..919a701 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,9 +1,10 @@ -# 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 # here under Gitlab's CI environment. -PATH := $(realpath ..):$(realpath .):${PATH} +PARDIR=$(realpath ..) +PATH := $(PARDIR):$(realpath .):${PATH} GCOV?=gcov # Make this overrideable so it's easier to test old versions @@ -24,8 +25,8 @@ check: savecheck regress @-advent -l /dev/null /dev/null coverage: check - lcov -t "advent" -o ../advent.info -c -d .. --gcov-tool=$(GCOV) - genhtml -o ../coverage/ ../advent.info + 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 @@ -43,38 +44,41 @@ listcheck: # Generate bogus savegames. savegames: + @$(ECHO) "cheat: Generate save file with -900 deaths" + @$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie @$(ECHO) "cheat: Generate save file with -1000 deaths" - @../cheat -d -1000 -o cheat_numdie.adv > /tmp/cheat_numdie + @$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000 @$(ECHO) "cheat: Generate save file with version -1337" - @../cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion + @$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion @$(ECHO) "cheat: Generate save file 1000 saves" - @../cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves + @$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves @$(ECHO) "cheat: Generate save file 1000 turns" - @../cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns + @$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns @$(ECHO) "cheat: Generate save file 1000 turns" - @../cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp + @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp @rm -f /tmp/cheat* # Rebuild characterizing tests buildregress: savegames - ../cheat -s -1000 -o thousand_saves.adv > /tmp/regress1000saves + $(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 savecheck: savegames @$(ECHO) "TEST cheat: Bogus option for save file generation" - @../cheat -QqQ 2> /tmp/coverage_cheat_batopt | true + @$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true @$(ECHO) "TEST cheat: No save file specified" - @../cheat 2>/dev/null | true + @$(PARDIR)/cheat 2>/dev/null | true @$(ECHO) "TEST cheat: Fail to save because we omit -o" - @../cheat -d 1 2> /tmp/coverage_cheat_nooutput | true + @$(PARDIR)/cheat -d 1 2> /tmp/coverage_cheat_nooutput | true @$(ECHO) "TEST cheat: Fail to save to invalid path" - @../cheat -o / 2> /tmp/coverage_cheat_badoutput | true + @$(PARDIR)/cheat -o / 2> /tmp/coverage_cheat_badoutput | true @$(ECHO) "TEST advent: Start with invalid file with -r" @advent -r /badfilename < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1 @$(ECHO) "TEST advent: Start with invalid file with -l" @@ -93,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