From f3c1edf8d25e0f676eb66b8ae5593055af130dac Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 28 Dec 2020 11:15:46 +0100 Subject: [PATCH] Make: Slighly less verbose "make check" output Signed-off-by: Markus Armbruster --- Make.mk | 57 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/Make.mk b/Make.mk index e809e376d..072e27f48 100644 --- a/Make.mk +++ b/Make.mk @@ -97,6 +97,11 @@ else quiet-command = @echo $2 && $1 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 # Recursively expanded so that $@ and $< work. subst.in = sed \ @@ -253,35 +258,35 @@ check: export EMPIRE_CHECK_ACCEPT := check-accept: export EMPIRE_CHECK_ACCEPT := y _check: all @echo "Warning: test suite is immature and needs work." >&2 - $(srcdir)/tests/files-test $(srcdir) - $(srcdir)/tests/fairland-test $(srcdir) - $(srcdir)/tests/info-test $(srcdir) + $(call run-test, $(srcdir)/tests/files-test) + $(call run-test, $(srcdir)/tests/fairland-test) + $(call run-test, $(srcdir)/tests/info-test) ifeq ($(empthread),LWP) - $(srcdir)/tests/smoke-test $(srcdir) - $(srcdir)/tests/actofgod-test $(srcdir) - $(srcdir)/tests/build-test $(srcdir) - $(srcdir)/tests/load-tend-test $(srcdir) - $(srcdir)/tests/navi-march-test $(srcdir) - $(srcdir)/tests/fire-test $(srcdir) - $(srcdir)/tests/torpedo-test $(srcdir) - $(srcdir)/tests/bridgefall-test $(srcdir) - $(srcdir)/tests/retreat-test $(srcdir) - $(srcdir)/tests/update-test $(srcdir) - $(srcdir)/tests/version-test $(srcdir) + $(call run-test, $(srcdir)/tests/smoke-test) + $(call run-test, $(srcdir)/tests/actofgod-test) + $(call run-test, $(srcdir)/tests/build-test) + $(call run-test, $(srcdir)/tests/load-tend-test) + $(call run-test, $(srcdir)/tests/navi-march-test) + $(call run-test, $(srcdir)/tests/fire-test) + $(call run-test, $(srcdir)/tests/torpedo-test) + $(call run-test, $(srcdir)/tests/bridgefall-test) + $(call run-test, $(srcdir)/tests/retreat-test) + $(call run-test, $(srcdir)/tests/update-test) + $(call run-test, $(srcdir)/tests/version-test) else - @echo "$(srcdir)/tests/smoke-test SKIPPED" - @echo "$(srcdir)/tests/actofgod-test SKIPPED" - @echo "$(srcdir)/tests/build-test SKIPPED" - @echo "$(srcdir)/tests/load-tend-test SKIPPED" - @echo "$(srcdir)/tests/navi-march-test SKIPPED" - @echo "$(srcdir)/tests/fire-test SKIPPED" - @echo "$(srcdir)/tests/torpedo-test SKIPPED" - @echo "$(srcdir)/tests/bridgefall-test SKIPPED" - @echo "$(srcdir)/tests/retreat-test SKIPPED" - @echo "$(srcdir)/tests/update-test SKIPPED" - @echo "$(srcdir)/tests/version-test SKIPPED" + @echo "TEST $(srcdir)/tests/smoke-test SKIPPED" + @echo "TEST $(srcdir)/tests/actofgod-test SKIPPED" + @echo "TEST $(srcdir)/tests/build-test SKIPPED" + @echo "TEST $(srcdir)/tests/load-tend-test SKIPPED" + @echo "TEST $(srcdir)/tests/navi-march-test SKIPPED" + @echo "TEST $(srcdir)/tests/fire-test SKIPPED" + @echo "TEST $(srcdir)/tests/torpedo-test SKIPPED" + @echo "TEST $(srcdir)/tests/bridgefall-test SKIPPED" + @echo "TEST $(srcdir)/tests/retreat-test SKIPPED" + @echo "TEST $(srcdir)/tests/update-test SKIPPED" + @echo "TEST $(srcdir)/tests/version-test SKIPPED" endif - $(srcdir)/tests/empdump-test $(srcdir) + $(call run-test, $(srcdir)/tests/empdump-test) ### Implicit rules -- 2.43.0