TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
.PHONY: check coverage clean testlist listcheck savegames buildregress
-.PHONY: savecheck regress
+.PHONY: savecheck regress tap count multifile-regress
-check: savecheck regress
- @echo "=== No diff output is good news."
- @-advent -x 2>/dev/null # Get usage message into coverage tests
- @-advent -l /dev/null <pitfall.log >/dev/null
+check: savegames
+ @make tap | $(TAPFILTER)
coverage: check
lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
genhtml -o $(PARDIR)/coverage/ $(PARDIR)/advent.info
+ @-advent -x 2>/dev/null # Get usage message into coverage tests
+ @-advent -l /dev/null <pitfall.log >/dev/null
+ make savecheck
./coverage_dungeon.py
.SUFFIXES: .chk
if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
done
-# 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"
- @$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
- @$(ECHO) "cheat: Generate save file with version -1337"
- @$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
- @$(ECHO) "cheat: Generate save file 1000 saves"
- @$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
- @$(ECHO) "cheat: Generate save file 1000 turns"
- @$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns
- @$(ECHO) "cheat: Generate save file 1000 turns"
- @$(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
echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
rm -f scratch.tmp
+# Generate bogus savegames for coverage testing. Needed for one test log as well
+savegames:
+ @# Generate save file with -900 deaths
+ @$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
+ @# Generate save file with -1000 deaths
+ @$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
+ @# cheat: Generate save file with version -1337
+ @$(PARDIR)/cheat -v -1337 -o resume_badversion.adv > /tmp/cheat_badversion
+ @# cheat: Generate save file 1000 saves
+ @$(PARDIR)/cheat -s -1000 -o thousand_saves.adv > /tmp/cheat_1000saves
+ @# Generate save file 1000 turns
+ @$(PARDIR)/cheat -t -1000 -o thousand_saves.adv > /tmp/cheat_1000turns
+ @# cheat: Generate save file 1000 turns
+ @$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
+ @rm -f /tmp/cheat*
+
+# Force coverage of various edge cases
savecheck: savegames
@$(ECHO) "TEST cheat: Bogus option for save file generation"
@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@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:
- @for file in $(TESTLOADS); do \
- $(ECHO) -n " $${file} "; grep '##' $${file}.log || echo ' ## (no description)'; \
- 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 \
- 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
# 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
+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))
projects / open-adventure.git / blobdiff