empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make: Slighly less verbose "make check" output

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-12-28 11:15:46 +01:00
parent 1a10b41ae8
commit f3c1edf8d2
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Make.mk
View file

@ -97,6 +97,11 @@ else
quiet-command = @echo $2 && $1 quiet-command = @echo $2 && $1
endif endif
# Helper for running tests
# Usage: $(call run-test, SHELL-SCRIPT)
# Recursively expanded, or else parameters don't work
run-test = $(call quiet-command, $1 $(srcdir), TEST $1)
# How to substitute Autoconf output variables # How to substitute Autoconf output variables
# Recursively expanded so that $@ and $< work. # Recursively expanded so that $@ and $< work.
subst.in = sed \ subst.in = sed \
@ -253,35 +258,35 @@ check: export EMPIRE_CHECK_ACCEPT :=
check-accept: export EMPIRE_CHECK_ACCEPT := y check-accept: export EMPIRE_CHECK_ACCEPT := y
_check: all _check: all
@echo "Warning: test suite is immature and needs work." >&2 @echo "Warning: test suite is immature and needs work." >&2
$(srcdir)/tests/files-test $(srcdir) $(call run-test, $(srcdir)/tests/files-test)
$(srcdir)/tests/fairland-test $(srcdir) $(call run-test, $(srcdir)/tests/fairland-test)
$(srcdir)/tests/info-test $(srcdir) $(call run-test, $(srcdir)/tests/info-test)
ifeq ($(empthread),LWP) ifeq ($(empthread),LWP)
$(srcdir)/tests/smoke-test $(srcdir) $(call run-test, $(srcdir)/tests/smoke-test)
$(srcdir)/tests/actofgod-test $(srcdir) $(call run-test, $(srcdir)/tests/actofgod-test)
$(srcdir)/tests/build-test $(srcdir) $(call run-test, $(srcdir)/tests/build-test)
$(srcdir)/tests/load-tend-test $(srcdir) $(call run-test, $(srcdir)/tests/load-tend-test)
$(srcdir)/tests/navi-march-test $(srcdir) $(call run-test, $(srcdir)/tests/navi-march-test)
$(srcdir)/tests/fire-test $(srcdir) $(call run-test, $(srcdir)/tests/fire-test)
$(srcdir)/tests/torpedo-test $(srcdir) $(call run-test, $(srcdir)/tests/torpedo-test)
$(srcdir)/tests/bridgefall-test $(srcdir) $(call run-test, $(srcdir)/tests/bridgefall-test)
$(srcdir)/tests/retreat-test $(srcdir) $(call run-test, $(srcdir)/tests/retreat-test)
$(srcdir)/tests/update-test $(srcdir) $(call run-test, $(srcdir)/tests/update-test)
$(srcdir)/tests/version-test $(srcdir) $(call run-test, $(srcdir)/tests/version-test)
else else
@echo "$(srcdir)/tests/smoke-test SKIPPED" @echo "TEST $(srcdir)/tests/smoke-test SKIPPED"
@echo "$(srcdir)/tests/actofgod-test SKIPPED" @echo "TEST $(srcdir)/tests/actofgod-test SKIPPED"
@echo "$(srcdir)/tests/build-test SKIPPED" @echo "TEST $(srcdir)/tests/build-test SKIPPED"
@echo "$(srcdir)/tests/load-tend-test SKIPPED" @echo "TEST $(srcdir)/tests/load-tend-test SKIPPED"
@echo "$(srcdir)/tests/navi-march-test SKIPPED" @echo "TEST $(srcdir)/tests/navi-march-test SKIPPED"
@echo "$(srcdir)/tests/fire-test SKIPPED" @echo "TEST $(srcdir)/tests/fire-test SKIPPED"
@echo "$(srcdir)/tests/torpedo-test SKIPPED" @echo "TEST $(srcdir)/tests/torpedo-test SKIPPED"
@echo "$(srcdir)/tests/bridgefall-test SKIPPED" @echo "TEST $(srcdir)/tests/bridgefall-test SKIPPED"
@echo "$(srcdir)/tests/retreat-test SKIPPED" @echo "TEST $(srcdir)/tests/retreat-test SKIPPED"
@echo "$(srcdir)/tests/update-test SKIPPED" @echo "TEST $(srcdir)/tests/update-test SKIPPED"
@echo "$(srcdir)/tests/version-test SKIPPED" @echo "TEST $(srcdir)/tests/version-test SKIPPED"
endif endif
$(srcdir)/tests/empdump-test $(srcdir) $(call run-test, $(srcdir)/tests/empdump-test)
### Implicit rules ### Implicit rules