Merged base-tests branch from epics-base-testing team.

Modified testspec output to omit Tests: line when empty
Added testspec generation to src/db/test/Makefile.
This commit is contained in:
Andrew Johnson
2010-08-04 14:16:14 -05:00
3 changed files with 18 additions and 1 deletions

View File

@@ -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
#
@@ -315,6 +322,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) >> $@
$(if $^, @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) $@

View File

@@ -17,6 +17,8 @@ callbackTest_SRCS += callbackTest.c
OBJS_IOC_vxWorks += callbackTest
TESTS += callbackTest
# When we add more test programs here, this must become a vxTestHarness
TESTSPEC_vxWorks = callbackTest.o; callbackTest
TESTSCRIPTS_HOST += $(TESTS:%=%.t)

View File

@@ -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)