From cbf917e8332d620b6a2f60ea9822d1f84467ef28 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Thu, 16 Apr 2020 12:04:16 +0200 Subject: [PATCH] Improve automated testing rules to allow other test frameworks - make runtests a double-colon rule, so that other test frameworks can add their own recipes independently - only define runtests:: $TESTSCRIPTS rule when there are TESTSCRIPTS (to avoid having it run every time when no TESTSCRIPTS are defined) - $(strip $TAPFILES) inside ifneq to fix trouble when TAPFILES=' ' --- configure/RULES_BUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index ca05f19c6..8bc94ba33 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -335,10 +335,12 @@ $(MODNAME): %$(MODEXT): %$(EXE) #--------------------------------------------------------------- # Automated testing -runtests: $(TESTSCRIPTS) +ifneq ($(strip $(TESTSCRIPTS)),) +runtests:: $(TESTSCRIPTS) ifdef RUNTESTS_ENABLED -$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^ endif +endif testspec: $(TESTSCRIPTS) @$(RM) $@ @@ -349,7 +351,7 @@ testspec: $(TESTSCRIPTS) $(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@) test-results: tapfiles -ifneq ($(TAPFILES),) +ifneq ($(strip $(TAPFILES)),) ifdef RUNTESTS_ENABLED $(PROVE) --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES) endif