From f10d0d95b0618716c03ce9544962a960b4f1a09b Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 21 Apr 2020 11:45:50 +0200 Subject: [PATCH] Apply perl rules for .tap and .xml only to perl tests Don't apply the %.tap: %.t and %.xml: %.tap rules to tap and junit result files from other test frameworks. (They would overwrite the other frameworks' own rules.) --- configure/RULES_BUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 28ece67e1..c7f3ba7b6 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -112,8 +112,10 @@ TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME) ifneq (,$(filter $(T_A), $(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS))) RUNTESTS_ENABLED = YES TESTSCRIPTS.t = $(filter %.t, $(TESTSCRIPTS)) -TAPFILES += $(TESTSCRIPTS.t:.t=.tap) -JUNITFILES += $(TESTSCRIPTS.t:.t=.xml) +TAPFILES.t += $(TESTSCRIPTS.t:.t=.tap) +JUNITFILES.t += $(TESTSCRIPTS.t:.t=.xml) +TAPFILES += $(TAPFILES.t) +JUNITFILES += $(JUNITFILES.t) endif #--------------------------------------------------------------- @@ -364,12 +366,12 @@ ifneq ($(CURRENT_JUNITFILES),) endif # A .tap file is the output from running the associated test script -$(TAPFILES): %.tap: %.t +$(TAPFILES.t): %.tap: %.t ifdef RUNTESTS_ENABLED -$(PERL) $< -tap > $@ endif -$(JUNITFILES): %.xml: %.tap +$(JUNITFILES.t): %.xml: %.tap $(TAPTOJUNIT) --puretap --output $@ --input $< $* # If there's a perl test script (.plt) available, use it