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:
337377a
)
Simplify the test machinery.
author
Eric S. Raymond
<esr@thyrsus.com>
Wed, 13 Apr 2022 07:59:57 +0000
(
03:59
-0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Wed, 13 Apr 2022 07:59:57 +0000
(
03:59
-0400)
tests/Makefile
patch
|
blob
|
history
diff --git
a/tests/Makefile
b/tests/Makefile
index aa7834f652e4cd44c050b5a05f6589e822bc61f6..7c27f117efb3bbe643841f2935d0bc5b28a75168 100644
(file)
--- a/
tests/Makefile
+++ b/
tests/Makefile
@@
-17,10
+17,10
@@
ECHO := /bin/echo
TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///' | sort)
.PHONY: check coverage clean testlist listcheck savegames buildregress
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:
tapcheck
- @
echo "=== No diff output is good news."
+check:
savegames
+ @
make tap | $(TAPFILTER)
coverage: check
lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
coverage: check
lcov -t "advent" -o $(PARDIR)/advent.info -c -d $(PARDIR) --gcov-tool=$(GCOV)
@@
-54,19
+54,19
@@
buildregress: savegames
echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
rm -f scratch.tmp
echo "inven" | advent isofoo.log /dev/stdin >multifile.chk
rm -f scratch.tmp
-# Generate bogus savegames for coverage testing.
+# Generate bogus savegames for coverage testing.
Needed for one test log as well
savegames:
savegames:
- @
$(ECHO) "cheat: Generate save file with -900 deaths"
+ @
# Generate save file with -900 deaths
@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
@$(PARDIR)/cheat -d -900 -o cheat_numdie.adv > /tmp/cheat_numdie
- @
$(ECHO) "cheat: Generate save file with -1000 deaths"
+ @
# Generate save file with -1000 deaths
@$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
@$(PARDIR)/cheat -d -1000 -o cheat_numdie1000.adv > /tmp/cheat_numdie1000
- @
$(ECHO) "cheat: Generate save file with version -1337"
+ @
# cheat: Generate save file with version -1337
@$(PARDIR)/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: Generate save file 1000 saves
@$(PARDIR)/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"
+ @
# Generate save file 1000 turns
@$(PARDIR)/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: Generate save file 1000 turns
@$(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*
@@
-96,24
+96,19
@@
TAPCONSUMER=tapview
# the logfiles to carry the raw TAP messages.
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
# the logfiles to carry the raw TAP messages.
TAPFILTER=$(shell command -v $(TAPCONSUMER) || echo cat)
-FAILLOG=/tmp/advent-test.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 $<`; \
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)
+ $(advent) $$OPTS <$< | tapdiffer "$<: $${legend}" "$${test}.chk")
multifile-regress:
multifile-regress:
- @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
>>$(FAILLOG)
+ @(echo "inven" | advent isofoo.log /dev/stdin) | tapdiffer "multifile: multiple-file test" multifile.chk
TEST_TARGETS = $(RUN_TARGETS) multifile-regress
tap: count $(TEST_TARGETS)
count:
TEST_TARGETS = $(RUN_TARGETS) multifile-regress
tap: count $(TEST_TARGETS)
count:
- @echo 1..$(words $(TEST_TARGETS)) >$(FAILLOG)
-
-tapcheck:
- @make --no-print-directory tap; tapview <$(FAILLOG)
+ @echo 1..$(words $(TEST_TARGETS))
# end
# end