From 31790737e4c9f6f27532b22100d17b53ce02de1f Mon Sep 17 00:00:00 2001 From: Nick Rees Date: Thu, 27 May 2010 15:36:52 +0100 Subject: [PATCH 1/2] Added Andrews changes to RULES_BUILD to generate a hint file for the runner --- configure/RULES_BUILD | 7 +++++++ src/libCom/test/Makefile | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 7d955798e..906d80c75 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -315,6 +315,13 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ) runtests: $(TESTSCRIPTS_$(BUILD_CLASS)) -$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^ +testspec: $(TESTSCRIPTS_$(BUILD_CLASS)) + @$(RM) $@ + @echo OS-class: $(OS_CLASS) > $@ + @echo Target-arch: $(T_A) >> $@ + @echo Tests: $^ >> $@ + $(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@) + # If there's a perl test script (.plt) available, use it %.t: ../%.plt @$(RM) $@ diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile index edf4ab369..bbc888590 100644 --- a/src/libCom/test/Makefile +++ b/src/libCom/test/Makefile @@ -142,11 +142,12 @@ testHarness_SRCS += epicsRunLibComTests.c PROD_vxWorks = vxTestHarness vxTestHarness_SRCS += $(testHarness_SRCS) vxTestHarness_OBJS += $(INSTALL_BIN)/vxComLibrary +TESTSPEC_vxWorks = vxTestHarness.munch; epicsRunLibComTests PROD_RTEMS += rtemsTestHarness rtemsTestHarness_SRCS += rtemsTestHarness.c rtemsTestHarness_SRCS += $(testHarness_SRCS) - +TESTSPEC_RTEMS = rtemsTestHarness.boot; epicsRunLibComTests TESTSCRIPTS_HOST += $(TESTS:%=%.t) From 08f2e5c41f36139c5a3813fa60ae40aec7864370 Mon Sep 17 00:00:00 2001 From: Nick Rees Date: Thu, 27 May 2010 16:21:32 +0100 Subject: [PATCH 2/2] Added automatic generation of testspec to RULES_BUILD --- configure/RULES_BUILD | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 906d80c75..ea0ec7154 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -88,6 +88,13 @@ include $(CONFIG)/RULES_TARGET # PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS) +#--------------------------------------------------------------- +# Generate a test specification if any tests are defined. +# +ifneq (,$(strip $(TESTS))) +TARGETS+=testspec +endif + #--------------------------------------------------------------- # Libraries #