projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd7b664
)
Reorganize and clean up test machinery.
author
Eric S. Raymond
<esr@thyrsus.com>
Thu, 14 Apr 2022 16:27:15 +0000
(12:27 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Thu, 14 Apr 2022 16:27:15 +0000
(12:27 -0400)
tests/Makefile
patch
|
blob
|
history
diff --git
a/tests/Makefile
b/tests/Makefile
index 4acc93dffa75f30f9cbcca06ff58d5e537e23751..59f29721d84eec127bbbdd9f6bae6ad0480ec4a9 100644
(file)
--- 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
# 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)
# Find all *.log entries to test
TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
-.PHONY: check c
overage clean testlist listcheck savegames buildregress
-.PHONY:
savecheck regress
+.PHONY: check c
lean testlist listcheck savegames savecheck coverage
+.PHONY:
buildchecks multifile-regress tap count
-check: savecheck tapcheck
+check: savecheck
+ @make tap | tapview
@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
@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
-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:
.SUFFIXES: .chk
clean:
@@
-58,18
+62,7
@@
savegames:
@$(PARDIR)/cheat -l -1000 -o thousand_lamp.adv > /tmp/cheat_1000lamp
@rm -f /tmp/cheat*
@$(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
savecheck: savegames
@$(ECHO) "TEST cheat: Bogus option for save file generation"
@$(PARDIR)/cheat -QqQ 2> /tmp/coverage_cheat_batopt | true
@@
-87,13
+80,21
@@
savecheck: savegames
@advent -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
@rm -f /tmp/coverage*
@advent -r thousand_saves.adv < pitfall.log > /tmp/coverage_advent_readfail 2>&1 || exit 1
@rm -f /tmp/coverage*
-# The TAP filter. Only affects presentation of the test suite messages
-TAPCONSUMER=tapview
+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
-# 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)
+# Rebuild characterizing tests
+buildchecks: 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
RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
$(RUN_TARGETS): run-regress-%: %.log
RUN_TARGETS=$(TESTLOADS:%=run-regress-%)
$(RUN_TARGETS): run-regress-%: %.log
@@
-110,7
+111,4
@@
tap: count $(TEST_TARGETS)
count:
@echo 1..$(words $(TEST_TARGETS))
count:
@echo 1..$(words $(TEST_TARGETS))
-tapcheck:
- @make tap | tapview
-
# end
# end